cleaning up models, rake task