Removal of old code and printlines