Removed stuff that shouldn't be there