Remove validation functions and minor fixes