Removed unwanted using statements and sorted the ones being used