Removed stuff that did not need to be added at all