Remove import * where present
Remove unused module