Further cleanup of overlay