ResourceData cleanup