Seperated the remote and local validator
Fixed issues with custom validators
Fixed both validators. and removed extra code.