TODO updated
removed legacy code