Cleanup engine code
Cleanup engine code


Former-commit-id: 4e3b749d562e096e66f14a2cc00068c139074b60
slipset/planck,DerekCuevas/planck,mfikes/planck,slipset/planck,mnespor/planck,slipset/planck,mfikes/planck,mfikes/planck,ericstewart/planck,ericstewart/planck,slipset/planck,mfikes/planck,mnespor/planck,ericstewart/planck,DerekCuevas/planck,slipset/planck,mfikes/planck,DerekCuevas/planck,mfikes/planck,mnespor/planck