Remove two more checks that have been commented out for years