Remove unused groups

Hi Susan,  

Try this - I cleaned up the accidental ccnmtl branch and this is what I meant.