Removed commented code and log statements.