TODO: Clean-up and improve.

Remove old items.  Order items by importance.