Updating comments and cleaning up some unused code.