Remove more dead code
Use std::map instead of ... something ...
Remove unused homegrown stack