moved to (more) proper config system