Consolidating validate, removing werkzeug