minor cleanup of support files
more cleanup
more cleanup