Updated expiration data, removed deprecated functions
12 files changed