From my experience met with mostly bodyweight work tends to strip off excess muscle the fastest. Keep in the barbell stuff if you want though.
Most people I know that have done gymnastics or something similar with mostly bodyweight work on a regular basis tend to strip off any excess muscle mass that they don't need.
Otherwise, it's mostly diet like the above have said. Avoid the heavy lifting and metcon it up.