Cleaning up Waymoot