Some overlay clean-up.