Definitely dump the water after you chill the butter in the fridge or freezer so it is solid and the water is easy to remove. You can clean the butter using water. There is a detailed thread on this. It will remove the taste and chlorophyl so the cannabutter tastes like regular butter. Basically they mix the butter and water, heat then cool and seperate it 3 times.