MAYR cleanup on the main.cpp