Cleanup: MainActivity