Remove old LIST code