Add TODO of removing legacy code