SSP-1930 Clean up imports