Removing unused code and commenting code.