Cleaning up expiration code