clean-up, more work on basic fixed expiration session