clean up, no functional change