Removed validation todo