Removed finish statements from main page