remove old cruft
further clean up