Introducing type world
Removing commented code