remove obsolete classes and improve comments