Removal of extensive logging