little fixes, remove old branches