Remove ActiveRecordHelper usage