ASSIST-63 - Removed TODO that's already done.