Remove and re-organisation of use statments for code cleanup.