remove unused dependencies
Add callback support for validating