Cleanup from refactoring rendering engine into makomi-express