Remove dependency of ServiceClosures and FormControls