Revised user guide, removed unused classes