Remove dead code and fix comments for new expire code.