Remove dead code
Cleanup. Starting work on variable reference counting