remove most of the check calls