Removed what seem to be useless kludges
Merge branch 'Zeno' into mtz