Removed / sorted using statements