more cleanup & test prep