Individual changes, removing unused codeand variables