Minor tidy-ups
Removed a few TODO's