If my memory serves me right, just open Bootcamp on your mac and select the option: "Remove Windows".
This should do everything for you.

Hope this helps
Grant