Cleaned up main.cpp a bit. Removed old commented code.