datamapper cleanup