Replace wildcard imports with explicit ones
Remove unused code causing warnings