more cleanup. no functional changes