remove branch track command; escape more quotes