Removed old checks