Cleaned up some comments and unneeded code.