cleanup cruft and use cleanup.sh to automate this