Take Esri layer handler out