Is this just a cleanup or necessary to solve this bug?