Final,camargo3,removed unused tests/code