Some config cleanup and perf levels