Removed old lazy check