Removed stuff that should be handled by polyglot