Updating the list.
Removing some dead code.