Remove dead code that comes after a return, next and break
Fixed graph and print types