Fix Svace issues by removing unused codes