Remove some more not really needed things