removing some off the default S2 stuff, ORM not need atm