Add -W and remove redundant imports