Fixed TODOs

Removed Conan class because we chose to create static objects for heros