Cleanup and add branches selection