EXPIRE, PEXPIRE and some cleanup