Fixed some TODOs, removed irrelevant ones