Remove old upstream code, add backports packages