Cleanup config (a bit). Started better profiling