Remove not needed stuff