* Fix list cleanup