Ditch custom checks