Remove some unneeded modules.  Also mark others so we can remove them later.
Change no_panopoly branch to their respective release branches.