Removing useless methods
Fixing validator tests