Remove wait for config change as it didn't work