further code cleaning on new 14.04 installation