Removing more stuff to root out ActiveRecord.