More progress, remove mongomapper related stuff