Removed commented code in main class