minor changes to undo auto imports