removed unused class and updated ValidationException handling