Engine framework
- cleanup
- last commit in this branch

