Remove eval graph and fix warnings