Cleanup configs

Fixes #29