Is there a ticket to track this bug? The ticket must reference the fact that there will be some cleaning to do here.