Removing un needed stuff