D7 1.x repo cleanup