Removed: even more config cruft