Code cleanup, remove and sort usings