clean up + testing preparation