More watermelon cleanup