cleaning things and updating.  likely preparing for use of ActiveRecord 4