svigerske remove or disable more unused-but-set variables