Removed trace extraction stuff