Remove some more TODOs and parts of code that don't make sense any more