Got rid of active record