Remove some debug code. Remove some unnecessary checks.