solving TODO; removing old code