Removing some redundant logging