Clean up MainActivity