More cleanup. Fixes #504
Patch bump