Remove todos duplicated within ExecuteBuilder (unless they require a new feature)