Removed some (redundant?) programmers' checks.