Old flapping cleanup

Fixes #615 and #616