Changing ColumnMapper to allow for polymorphic queries.
Removing unused code.