removed more superfluous stuff from iris
Merge branch 'release/0.7.1' into develop