rename content_object and remove commented out code
simplify check
missing rename of content_object
moving the deployment strategy classes around