Removed some difficult to parse parameters...