Remove assert.js, fix errors from last commit and delete unnecessary includes Fix #12