deprecating obsolete classes; some minor refactoring to seassion