cleaned up services and controllers for publishing