Issue #297: Removing leftovers.