Remove use of import *