more cleanup of unused code