Removed webzmachine dependency