Data mapper improvements inc. docblocs, unused code etc