[cvs-nhc98] Discarded obsolete classes; fixed bugs with shift + click.