Remove unnecessary DataMapper dependencies