removing some of the more obnoxious checks