Remove unused things
Remove unused import
Use repositories in form validators too