Removed already addressed todo