Clean up none-checks.