Basic cleaning of Zl scenario

No big changes