Clean up root check