Removed todo re validation