massive update for v2.3, removing v2.1.7 components