Removal of unnecessary logging