remove unused import, re-order defs