modified mongoid
clean up