[engine]More cleanup.