more cleanup

new stuff