Removed extra comments and logs