Clean imports and changed things