Cleaned up main.cpp

no more commented code, no more warnings
Clean compiles FTW