Merge "Removed references to MainActivity since they weren't necessary."