[CLEANUP] Make use of possible imports and remove unused ones