Remove the only 2 situations where a short open tag was used; the VM is not configured for this and we don't need it