Some main activity clean up