Removed expired check