Removing hard-coded lists.