code cleanup, no func changes #3847

#3847