Feature/70221904 jamesv remove todos