Made the grid deployment independent of some Idiap specific variables (when outside Idiap).