Clean up bg-picker