Cleanup type mappers