fix view cleanup