resort const lines with no spaces. remove unneeded usings