Cleanup items I forgot.  No functionality changes, but this version now  requires a minimum of cms version 0.11