Cleaning up associations related code