Remove wildcard import
Cleanup