Remove dead code
Merge pull request #587 from virgo-agent-toolkit/fix/cleanup_dead_code

Remove dead code