Some cleanup in main activity.
Some aditional cleanup