Got rid of some not needed stuff