Rather implement or remove, commented out is just going to be confusing.