Cleanup & reliability check