StartActivity cleaned up