Completed  GridWyse removal