Removed some no longer valid TODO-items