Can we remove the commented block entirely?