Removed unused comments button and some unused code