Organization view cleanup