Remove unnecessary outputs and add support for .svc