Rename sanity check to ensure it runs first
Dead code removal