clean imports and remove warnings