Should this remain commented out or should we remove it?