Revert mods to main.cpp