Merge pull request #99 from vreixo/issue96

Fix #96 - Just removed variables not used and remaining parts of the old