Remove dependency on active model