Clean up. Make all code use session class.