Removed unecessary comments and logs