Fixed delete expired, added a comparison to time