Remove & sort usings and update submodule