Remove cruft in api tree

A bunch of cruft has formed in the api tree.  We don't need these things
with versioned objects so best to remove  them.

Change-Id: I508258a4d6eb252fc18754808e3beb2409e3173e