Add validation utils
Remove unnecessary imports