clean up, no functionality change