Cleaning a leftover (deleted) made for Issue #564