removed old code, added a TODO