removed two TODOs