Fixing imports to remove .*