Minor refactoring
Remove unused mapping