Removed stuff that isn't needed