Some Cleanup

Import Cleanups in Activities and Fragments