DP-174 Removed todo