Removed stuff that's not right