Removed local calls from /validate