Remove datamapper dependant code