Improve eval output
Remove dead code, add missing include