Added TODO to rework to remove some unnecessary code