removed dead code, sequester more proprietary collection classes