Removed unneeded comments and log statements