Cleaned up unneeded header files, removed commented out lines, added comments where appropriate.