Removed unneeded comments and variables