Remove now-unused *Offset variables
Remove unnecessary overlay property updates