Remove unnecessary overrides to allow service to complete