CLDIDE-2162 Removed todo