Removed config checking - not necessary