Remove special case for lists