Remove some un-needed stuff