more cleanup & verification