1.0.2: remove unsed unneeded helper classes.