Cleaning up Tamwolf Checking