removed some more active record related code