Removed manual expiration, added transaction handling