Get rid of DataMapper code