Minor cleanup (too many PIs, etc.). Need to look closer at these classes, some should be updated and some are probably not used [1074]
E20, Get bundles working [1074]