remove unused using and sort