Clean up @imports