remove mappers, current mappers aren't good