[#632] Cleanup

Remove unused imports

Alpha order imports