Remove canary stuff