Removed comments and not useful log statements