IO cleanup

This is the branch to be integrated in 1.6.1, removing items deprecated in https://github.com/ariatemplates/ariatemplates/pull/1044

(last 3 commits are applicable)