Clean up main.cpp remove remapping
Cleanup