Minor: removed dead code
Minor: removed useless code generated by TinePG
Merge remote-tracking branch 'qsantos/cleaning' into develop