Removed engine from framework, tons of other stuff