Get rid of some iuneccesary stuff