Cleanup terrible Mapper interface