8.x 6.x cleanup