Removed more traces of ActiveRecord