Removed old check code