Cleanup from railties / hook method, and working on ActiveRecord implementation