Removed unused code and some notes and my stupid merge goof