Getting rid of unused code
Not really changed anything