Organise and remove usings