Cleaned up every thing, prepared to remove deprecated interface.