removed irrelevant TODOs