BVTCK-49 Removing assignment TODO markers