More clean-up and simplifications

Status Job ID Name Coverage
  Test
passed #3551
lidiap2015
py27-conda-idiap

00:03:34