clean up/removal of old builder-based operators