all TODO removed