Removed some unused code in MainActiity
More cleanup in MainActivity