Kill old deprecated TODO