[GAIA BUG1018819] - cleaning the code
Merge pull request #329 from michalbe/Bug1018819-temp

[GAIA BUG1018819] - cleaning the code