Cleanup wp list controller per Hagen's suggestion.