Moving soft delete code back inside jetty area, since code being placed depends on jetty being there.