Removed unused mapping variables. For #37