More refactorings- clean up refs to MainActivity