removed un-necessary comments and logs