SI-8916 Clean up unused imports, values and variables