deleted defaults
Copying the dev branch here.