more cleanup

argh