Remove "import *" usage (maintenance)