Unused import

Also, improve import layout