Cleanup & verification