Clean re-import after affected repo issues