o god, 1.6.x repo cleaning