Config cleanup

Fixes #94