VOYEUR: Remove a lot of outdated TODO's and clean up of stubbed methods