some cleanup on validation stuff