Cleanup, call method instead going to extt config