DAR-1498 Removed TODO