Removal of unnecessary imports