Code cleanup

Álvaro López Garcíarequested to merge
devel into master

Created by: jorge-lip

Code fixes and cleanup

Merge request reports