Added TODO comment around dead codes so they get removed later