remove redundant logging and comments