remove duplicate ccm-fir
make sure that a pending list exists
move things around so they work again
add goog-remb