z-index cleanup