ZVISION: Disable more unused code