a bit more cleanup for a fresh start