Removed ESAPI for now