Cleaning up while I'm finishing ActiveRecord