[GAIA BUG886754] - Removing trash from the code
Merge pull request #273 from michalbe/Bug886754-temp

[GAIA BUG886754] - Removing trash from the code