Remove unused import (and a bit of order)