[GAIA BUG984584] - Cleaning the code
Merge pull request #281 from michalbe/Bug984584-temp

[GAIA BUG984584] - Cleaning the code