Cleanup
Sync with dc.js master