WMS-EO: cleaned up