cleanup branch nightmare