Cleanup of preferences in preparation for redesign