Removed stuff that isn't used