Remove unused Validation stuff... Validation? What for?