Minort cleanup