More cleanup for runtime