Remove invalid imports; fix invalid imports