Remove redundancy in import paths