Cleaning up code, removing qunit.