Cleanup of imports