Some simplifications -> Removing useless code
Merge branch 'array' of ssh://github.com/emmt/TiPi into array