Improved wave clear to not respect passive