diff --git a/Gemfile b/Gemfile
index adec389..23da7bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,9 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'activesupport', '~> 6.0'
+gem 'activesupport', '~> 5.2.3'
 gem 'minitest'
 gem 'minitest-reporters'
-gem 'net-http-persistent', '>= 3.0.0'
+gem 'net-http-persistent'
 gem 'rake'
 gem 'rubocop'
diff --git a/README.md b/README.md
index 6b26576..c003703 100644
--- a/README.md
+++ b/README.md
@@ -12,66 +12,25 @@ First, you've to install the gem:
 gem install figo
 ```
 
-Now you can create a new session and access data:
+Now you can retrieve data with an user bound session
 
 ```ruby
-require "figo"
+require 'figo'
+connection = Figo::Connection.new(<client_id>, <client_secret>)
 
-session = Figo::Session.new("ASHWLIkouP2O6_bgA2wWReRhletgWKHYjLqDaqb0LFfamim9RjexTo22ujRIP_cjLiRiSyQXyt2kM1eXU2XLFZQ0Hro15HikJQT_eNeT_9XQ")
+# Trade in user credentials, refresh token or authorization code for access token.
+token_hash = connection.user_credential_request(<username>, <password>) # or..
+token_hash = connection.refresh_token_request(<refresh_token>) # or..
+token_hash = connection.authorization_code_request(<authorization_code>, <redirect_uri>)
 
-# Print out list of account numbers and balances.
+# Start session.
+session = Figo::Session.new(token_hash['access_token'])
+
+# Retrieve data
 session.accounts.each do |account|
   puts account.account_number
-  puts account.balance.balance
-end
-
-# Print out the list of all transaction originators/recipients of a specific account.
-session.get_account("A1.1").transactions.each do |transaction|
-  puts transaction.name
-end
-```
-
-It is just as simple to allow users to login through the API:
-
-```ruby
-require "figo"
-require "launchy"
-
-connection = Figo::Connection.new("<client ID>", "<client secret>", "http://my-domain.org/redirect-url")
-
-def start_login
-  # Open webbrowser to kick of the login process.
-  Launchy.open(connection.login_url("qweqwe"))
-end
-
-def process_redirect(authorization_code, state)
-  # Handle the redirect URL invocation from the initial start_login call.
-
-  # Ignore bogus redirects.
-  if state != "qweqwe"
-    return
-  end
-
-  # Trade in authorization code for access token.
-  token_hash = connection.obtain_access_token(authorization_code)
-
-  # Start session.
-  session = Figo::Session.new(token_hash["access_token"])
-
-  # Print out list of account numbers.
-  session.accounts.each do |account|
-    puts account.account_number
-  end
-end
+  ...
+}
 ```
 
-You can find more documentation at http://rubydoc.info/github/figo-connect/ruby-figo/master/frames
-
-Demos
------
-In this repository you can also have a look at a simple console(`console_demo.rb`) and web demo(`web_demo`). While the console demo simply accesses the figo API, the web demo implements the full OAuth flow.
-
-Requirements
-------------
-
-This gem requires Ruby 1.9.
+You can find more documentation at http://rubydoc.info/github/figo-connect/ruby-figo/master/frames
\ No newline at end of file
diff --git a/config.yml b/config.yml
deleted file mode 100644
index 1ec8699..0000000
--- a/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-API_ENDPOINT: api-preview.figo.me
-
diff --git a/console_demo.rb b/console_demo.rb
deleted file mode 100644
index d110c48..0000000
--- a/console_demo.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/figo'
-
-session = Figo::Session.new('ASHWLIkouP2O6_bgA2wWReRhletgWKHYjLqDaqb0LFfamim9RjexTo22ujRIP_cjLiRiSyQXyt2kM1eXU2XLFZQ0Hro15HikJQT_eNeT_9XQ')
-
-# Print out list of account numbers and balances.
-session.accounts.each do |account|
-  puts account.account_number
-  puts account.balance.balance
-end
-
-# Print out the list of all transaction originators/recipients of a specific account.
-session.get_account('A1.1').transactions.each do |transaction|
-  puts transaction.name
-end
diff --git a/lib/access/api_call.rb b/lib/access/api_call.rb
index d3cc5f8..81507f4 100644
--- a/lib/access/api_call.rb
+++ b/lib/access/api_call.rb
@@ -17,7 +17,7 @@ def accesses
   # @return [Access] access object created
   def add_access(access_method_id, credentials, consent)
     data = { access_method_id: access_method_id, credentials: credentials, consent: consent }
-    query_api('/rest/accesses', data = data, method = 'POST')
+    query_api('/rest/accesses', data, 'POST')
   end
 
   # Retrieve specific access.
@@ -25,7 +25,7 @@ def add_access(access_method_id, credentials, consent)
   # @param access_id [String] ID of the access to be retrieved.
   # @return [Access] access object
   def get_access(access_id)
-    query_api_object Access, "/rest/accesses/#{access_id}", method = 'GET'
+    query_api_object Access, "/rest/accesses/#{access_id}", 'GET'
   end
 
   # Remove stored PIN.
diff --git a/lib/account/api_call.rb b/lib/account/api_call.rb
index 5eaceea..ff96fbf 100644
--- a/lib/account/api_call.rb
+++ b/lib/account/api_call.rb
@@ -21,12 +21,14 @@ def get_account(account_id, cents = false)
   #
   # @param account [Account, String] the account to be removed or its ID
   def remove_account(account)
-    query_api account.is_a?(String) ? "/rest/accounts/#{account}" : "/rest/accounts/#{account.account_id}", nil, 'DELETE'
+    path = account.is_a?(String) ? "/rest/accounts/#{account}" : "/rest/accounts/#{account.account_id}"
+    query_api path, nil, 'DELETE'
   end
 
   # # Set bank account sort order
   # #
-  # # @param accounts [Array] List of JSON objects with the field account_id set to the internal figo Connect account ID (the accounts will be sorted in the list order)
+  # # @param accounts [Array] List of JSON objects with the field account_id
+  # #   set to the internal figo Connect account ID (the accounts will be sorted in the list order)
   # def account_sort_order (accounts)
   #   query_api "/rest/accounts", accounts, "PUT"
   # end
diff --git a/lib/account/model.rb b/lib/account/model.rb
index 457f4b0..7f0de00 100644
--- a/lib/account/model.rb
+++ b/lib/account/model.rb
@@ -82,7 +82,8 @@ def initialize(session, json)
     #
     # @param since [String, Date] this parameter can either be a transaction ID or a date
     # @param count [Integer] limit the number of returned transactions
-    # @param offset [Integer] which offset into the result set should be used to determin the first transaction to return (useful in combination with count)
+    # @param offset [Integer] which offset into the result set should be used to determin
+    #        the first transaction to return (useful in combination with count)
     # @param include_pending [Boolean] this flag indicates whether pending transactions should be included
     #        in the response; pending transactions are always included as a complete set, regardless of
     #        the `since` parameter
diff --git a/lib/authentification/api_call.rb b/lib/authentification/api_call.rb
index 74d01c6..fd07fc3 100644
--- a/lib/authentification/api_call.rb
+++ b/lib/authentification/api_call.rb
@@ -1,45 +1,6 @@
 # frozen_string_literal: true
 
 module Figo
-  # Get the URL a user should open in the web browser to start the login process.
-  #
-  # When the process is completed, the user is redirected to the URL provided to
-  # the constructor and passes on an authentication code. This code can be converted
-  # into an access token for data access.
-  #
-  # @param state [String] this string will be passed on through the complete login
-  #        process and to the redirect target at the end. It should be used to
-  #        validated the authenticity of the call to the redirect URL
-  # @param scope [String] optional scope of data access to ask the user for,
-  #        e.g. `accounts=ro`
-  # @return [String] the URL to be opened by the user.
-  def login_url(state, scope = nil)
-    data = { 'response_type' => 'code', 'client_id' => @client_id, 'state' => state }
-    data['redirect_uri'] = @redirect_uri unless @redirect_uri.nil?
-    data['scope'] = scope unless scope.nil?
-    "https://#{$api_endpoint}/auth/code?" + URI.encode_www_form(data)
-  end
-
-  # Exchange authorization code or refresh token for access token.
-  #
-  # @param authorization_code_or_refresh_token [String] either the authorization
-  #        code received as part of the call to the redirect URL at the end of the
-  #        logon process, or a refresh token
-  # @param scope [String] optional scope of data access to ask the user for,
-  #        e.g. `accounts=ro`
-  # @return [Hash] object with the keys `access_token`, `refresh_token` and `expires`, as documented in the figo Connect API specification.
-  def obtain_access_token(authorization_code_or_refresh_token, scope = nil)
-    # Authorization codes always start with "O" and refresh tokens always start with "R".
-    if authorization_code_or_refresh_token[0] == 'O'
-      data = { 'grant_type' => 'authorization_code', 'code' => authorization_code_or_refresh_token }
-      data['redirect_uri'] = @redirect_uri unless @redirect_uri.nil?
-    elsif authorization_code_or_refresh_token[0] == 'R'
-      data = { 'grant_type' => 'refresh_token', 'refresh_token' => authorization_code_or_refresh_token }
-      data['scope'] = scope unless scope.nil?
-    end
-    query_api '/auth/token', data
-  end
-
   # Return a Token dictionary which tokens are used for further API calls.
   #
   # @param username [String] figo username
diff --git a/lib/bank/api_call.rb b/lib/bank/api_call.rb
index e6c975b..ab0d8ba 100644
--- a/lib/bank/api_call.rb
+++ b/lib/bank/api_call.rb
@@ -22,7 +22,8 @@ def modify_bank(bank)
   # @param bank [Bank, String] the bank whose stored PIN should be removed or its ID
   # @return [nil]
   def remove_bank_pin(bank)
-    query_api bank.is_a?(String) ? "/rest/banks/#{bank}/remove_pin" : "/rest/banks/#{bank.bank_id}/remove_pin", nil, 'POST'
+    path = bank.is_a?(String) ? "/rest/banks/#{bank}/remove_pin" : "/rest/banks/#{bank.bank_id}/remove_pin"
+    query_api path, nil, 'POST'
   end
 
   # Get bank information from standard bank code
diff --git a/lib/catalog/api_call.rb b/lib/catalog/api_call.rb
index 0de8980..04a2878 100644
--- a/lib/catalog/api_call.rb
+++ b/lib/catalog/api_call.rb
@@ -9,8 +9,10 @@ def self.included(klass)
   # The real catalog contains thousands of entries, so expect the call to cause some traffic and delay.
   #
   # @param q [String] Two-letter country code. Show only resources within this country. Country code is case-insensitve.
-  # @param country [String] Query for the entire catalog. Will match banks on domestic bank code, BIC, name or figo-ID. Will match services based on name or figo-ID. Only exact matches are returned.
-  # @params objects [Enum] "banks" or "services", decide what is included in the api response. If not specified, it returns both
+  # @param country [String] Query for the entire catalog. Will match banks on domestic bank code, BIC, name or figo-ID.
+  #        Will match services based on name or figo-ID. Only exact matches are returned.
+  # @params objects [Enum] "banks" or "services", decide what is included in the api response.
+  #         If not specified, it returns both
   # @return [Catalog] modified bank object returned by server
   def get_supported_payment_services(q: nil, country: nil, objects: nil)
     list_catalog(q, country, complete_path("#{@prefix}/catalog", objects))
diff --git a/lib/figo.rb b/lib/figo.rb
index 67ccb68..2ad9ddf 100644
--- a/lib/figo.rb
+++ b/lib/figo.rb
@@ -23,19 +23,15 @@
 #
 
 require 'json'
-require 'yaml'
+require 'active_support/core_ext/object/to_query'
 
 require_relative './helpers/https.rb'
 require_relative './helpers/error.rb'
-
 require_relative './authentification/api_call.rb'
 
-require 'active_support/core_ext/object/to_query'
-
 # Ruby bindings for the figo Connect API: http://developer.figo.me
 module Figo
-  $config = YAML.load_file(File.join(__dir__, '../config.yml'))
-  $api_endpoint = $config['API_ENDPOINT']
+  API_ENDPOINT = 'api-preview.figo.me'
 
   # Represents a non user-bound connection to the figo Connect API.
   #
@@ -50,12 +46,11 @@ class Connection
     # @param client_id [String] the client ID
     # @param client_secret [String] the client secret
     # @param redirect_uri [String] optional redirect URI
-    def initialize(client_id, client_secret, redirect_uri = nil, api_endpoint = $api_endpoint)
+    def initialize(client_id, client_secret, redirect_uri = nil)
       @client_id = client_id
       @client_secret = client_secret
       @redirect_uri = redirect_uri
       @https = HTTPS.new("figo-#{client_id}", nil)
-      @api_endpoint = api_endpoint
     end
 
     # Helper method for making a OAuth 2.0 request.
@@ -64,7 +59,7 @@ def initialize(client_id, client_secret, redirect_uri = nil, api_endpoint = $api
     # @param data [Hash] this optional object will be used as url-encoded POST content.
     # @return [Hash] JSON response
     def query_api(path, data = nil, method = 'POST')
-      uri = URI("https://#{@api_endpoint}#{path}")
+      uri = URI("https://#{API_ENDPOINT}#{path}")
 
       # Setup HTTP request.
       request = method == 'POST' ? Net::HTTP::Post.new(path) : Net::HTTP::Get.new(path)
@@ -89,7 +84,7 @@ def query_api_object(type, path, data = nil, method = 'GET') # :nodoc:
     end
 
     def get_version
-      query_api '/version', data = nil, method = 'GET'
+      query_api '/version', nil, 'GET'
     end
   end
 
@@ -142,10 +137,9 @@ class Session
     # Create session object with access token.
     #
     # @param access_token [String] the access token
-    def initialize(access_token, api_endpoint = $api_endpoint)
+    def initialize(access_token)
       @access_token = access_token
       @https = HTTPS.new("figo-#{access_token}", nil)
-      @api_endpoint = api_endpoint
     end
 
     # Helper method for making a REST request.
@@ -155,7 +149,7 @@ def initialize(access_token, api_endpoint = $api_endpoint)
     # @param method [String] the HTTP method
     # @return [Hash] JSON response
     def query_api(path, data = nil, method = 'GET') # :nodoc:
-      uri = URI("https://#{@api_endpoint}#{path}")
+      uri = URI("https://#{API_ENDPOINT}#{path}")
 
       # Setup HTTP request.
       request = case method
@@ -167,7 +161,7 @@ def query_api(path, data = nil, method = 'GET') # :nodoc:
                   Net::HTTP::Delete.new(path)
                 else
                   Net::HTTP::Get.new(path)
-      end
+                end
 
       request['Authorization'] = "Bearer #{@access_token}"
       request['Accept'] = 'application/json'
diff --git a/lib/notification/api_call.rb b/lib/notification/api_call.rb
index 98352ff..c5f466c 100644
--- a/lib/notification/api_call.rb
+++ b/lib/notification/api_call.rb
@@ -37,6 +37,8 @@ def modify_notification(notification)
   #
   # @param notification [Notification, String] notification object which should be deleted or its ID
   def remove_notification(notification)
-    query_api notification.is_a?(String) ? "/rest/notifications/#{notification}" : "/rest/notifications/#{notification.notification_id}", nil, 'DELETE'
+    path = '/rest/notifications/'
+    path += notification.is_a?(String) ? notification : notification.notification_id
+    query_api path, nil, 'DELETE'
   end
 end
diff --git a/lib/notification/model.rb b/lib/notification/model.rb
index 2b851b6..f232099 100644
--- a/lib/notification/model.rb
+++ b/lib/notification/model.rb
@@ -6,10 +6,6 @@ module Figo
   class Notification < Base
     @dump_attributes = %i[observe_key notify_uri state]
 
-    def initialize(session, json)
-      super(session, json)
-    end
-
     # Internal figo Connect notification ID from the notification registration response
     # @return [String]
     attr_accessor :notification_id
diff --git a/lib/payment/api_call.rb b/lib/payment/api_call.rb
index d0639f4..d799023 100644
--- a/lib/payment/api_call.rb
+++ b/lib/payment/api_call.rb
@@ -34,7 +34,7 @@ def get_payment(account_id, payment_id, cents = false)
   #
   # @param payment [Payment] payment object to be created. It should not have a payment_id set, Required
   # @return [Payment] newly created `Payment` object
-  def add_payment(payment)
+  def create_payment(payment)
     query_api_object Payment, "/rest/accounts/#{payment.account_id}/payments", payment.dump, 'POST'
   end
 
@@ -51,9 +51,10 @@ def modify_payment(payment)
   # @param payment [Payment] payment to be submitted
   # @param tan_scheme_id [String] TAN scheme ID of user-selected TAN scheme, Required
   # @param state [String] Any kind of string that will be forwarded in the callback response message, Required
-  # @param redirect_uri [String] At the end of the submission process a response will be sent to this callback URL, Optional
+  # @param redirect_uri [String] At the end of the submission process a response will
+  #        be sent to this callback URL, Optional
   # @return [String] The result parameter is the URL to be opened by the user.
-  def submit_payment(payment, tan_scheme_id, state, redirect_uri)
+  def initiate_payment(payment, tan_scheme_id, state, redirect_uri)
     params = { tan_scheme_id: tan_scheme_id, state: state, redirect_uri: redirect_uri }.delete_if { |_k, v| v.nil? }
 
     query_api('/rest/accounts/' + payment.account_id + '/payments/' + payment.payment_id + '/init', params, 'POST')
@@ -65,7 +66,7 @@ def submit_payment(payment, tan_scheme_id, state, redirect_uri)
   # @param payment_id [String] figo ID of the payment to retrieve the initiation status for, Required
   # @param init_id [String] figo ID of the payment initation, Required
   # @return [Object] Initiation status of the payment
-  def submit_payment(account_id, payment_id, init_id)
+  def get_payment_initiation_status(account_id, payment_id, init_id)
     query_api("/rest/accounts/#{account_id}/payments/#{payment_id}/init#{init_id}", nil, 'GET')
   end
 
diff --git a/lib/payment/model.rb b/lib/payment/model.rb
index 3f82fad..a18e94d 100644
--- a/lib/payment/model.rb
+++ b/lib/payment/model.rb
@@ -70,7 +70,8 @@ def initialize(session, json)
     # @return [DateTime]
     attr_accessor :modification_timestamp
 
-    # ID of the transaction corresponding to this payment. This field is only set if the payment has been matched to a transaction
+    # ID of the transaction corresponding to this payment.
+    # This field is only set if the payment has been matched to a transaction
     # @return [String]
     attr_accessor :transaction_id
   end
diff --git a/lib/security/api_call.rb b/lib/security/api_call.rb
index c4bf2a4..7906ab0 100644
--- a/lib/security/api_call.rb
+++ b/lib/security/api_call.rb
@@ -18,8 +18,10 @@ def get_security(account_id, security_id)
   # @param options [Object] - further options (all are optional)
   #   @param options.account_id [String] - ID of the account for which to retrieve the securities
   #   @param options.accounts [Array] - filter the securities to be only from these accounts
-  #   @param options.since [Date] - ISO date filtering the returned securities by their creation or last modification date
-  #   @param options.since_type [String] - defines hot the `since` will be interpreted: `traded`, `created` or `modified`
+  #   @param options.since [Date] - ISO date filtering the returned securities by
+  #                                 their creation or last modification date
+  #   @param options.since_type [String] - defines hot the `since` will
+  #                                        be interpreted: `traded`, `created` or `modified`
   #   @param options.count [Number] - limit the number of returned transactions
   #   @param options.offset [Number] - offset into the implicit list of transactions
   # @return [Security] - An array of `Security` objects.
@@ -27,12 +29,18 @@ def get_securities(options = nil)
     options ||= {}
     options['count'] ||= 1000
     options['offset'] ||= 0
-    if !options['account_id']
+    if options['account_id'].nil? || options['account_id'].empty?
       query_api_object Security, '/rest/securities?' + URI.encode_www_form(options), nil, 'GET', 'securities'
     else
       account_id = options['account_id']
       options.delete('account_id')
-      query_api_object Security, '/rest/accounts/' + account_id + '/securities?' + URI.encode_www_form(options), nil, 'GET', 'securities'
+      query_api_object(
+        Security,
+        "/rest/accounts/#{account_id}/securities?#{URI.encode_www_form(options)}",
+        nil,
+        'GET',
+        'securities'
+      )
     end
   end
 
diff --git a/lib/security/model.rb b/lib/security/model.rb
index 5f3b2e9..4d46cfa 100644
--- a/lib/security/model.rb
+++ b/lib/security/model.rb
@@ -4,7 +4,12 @@
 module Figo
   # Object representing a Payment
   class Security < Base
-    @dump_attributes = %i[name isin wkn currency quantity amount amount_original_currency exchange_rate price price_currency purchase_price purchase_price_currency visited]
+    @dump_attributes = %i[
+      name isin wkn currency quantity amount
+      amount_original_currency exchange_rate
+      price price_currency purchase_price
+      purchase_price_currency visited
+    ]
 
     def initialize(session, json)
       super(session, json)
diff --git a/lib/standing_order/api_call.rb b/lib/standing_order/api_call.rb
index 2a299a4..8d042c4 100644
--- a/lib/standing_order/api_call.rb
+++ b/lib/standing_order/api_call.rb
@@ -19,7 +19,8 @@ def get_standing_order(standing_order_id, account_id = nil, cents = false)
   # Get all standing orders.
   # @param cents [Boolean] - whether to show the balance in cents, Optional, default: false
   # @param account_id [String] - ID of account, Optional
-  # @param accounts [Array] - ID of accounts to retreived the standing orders, Optional, (cannot be used with account_id)
+  # @param accounts [Array] - ID of accounts to retreived the standing orders, Optional,
+  #                           (cannot be used with account_id)
   # @return [StandingOrder] a list of `standing_order` objects.
   def get_standing_orders(account_id = nil, cents = false, accounts = nil)
     if account_id.nil?
@@ -47,6 +48,6 @@ def remove_standing_orders(account_id = nil)
            else
              "/rest/accounts/#{account_id}/standing_orders"
            end
-    query_api "/rest/accounts/#{account_id}/standing_orders", nil, 'DELETE'
+    query_api path, nil, 'DELETE'
   end
 end
diff --git a/lib/standing_order/model.rb b/lib/standing_order/model.rb
index 2c32588..ae2059e 100644
--- a/lib/standing_order/model.rb
+++ b/lib/standing_order/model.rb
@@ -6,10 +6,6 @@ module Figo
   class StandingOrder < Base
     @dump_attributes = []
 
-    def initialize(session, json)
-      super(session, json)
-    end
-
     # Name of creditor or debtor
     # @return [String]
     attr_accessor :name
@@ -34,14 +30,11 @@ def initialize(session, json)
     # @return [Number]
     attr_accessor :execution_day
 
-    # The interval the standing order gets executed (possible values are weekly, monthly, two monthly, quarterly, half yearly and yearly)
+    # The interval the standing order gets executed (possible values are weekly, monthly,
+    # two monthly, quarterly, half yearly and yearly)
     # @return [String]
     attr_accessor :interval
 
-    # Name of recipient
-    # @return [String]
-    attr_accessor :name
-
     # Account number recipient
     # @return [String]
     attr_accessor :account_number
diff --git a/lib/sync/api_call.rb b/lib/sync/api_call.rb
index f3a1fec..6d9b0a3 100644
--- a/lib/sync/api_call.rb
+++ b/lib/sync/api_call.rb
@@ -5,22 +5,17 @@ module Figo
   # Start provider synchronization
   #
   # @param access_id [String] Figo ID of the access
-  # @param disable_notifications [Boolean] This flag indicates whether notifications should be sent to your application, default: False
+  # @param disable_notifications [Boolean] This flag indicates whether notifications
+  #        should be sent to your application, default: False
   # @param redirect_uri [String] The URI to which the end user is redirected in OAuth cases, Optional
   # @param state [String] An arbitrary string to maintain state between this request and the callback, Optional
   # @param credentials [Object] Credentials used for authentication with the financial service provider, Optional
-  # @param save_secret [Boolean] Indicates whether the confidential parts of the credentials should be saved, Defaulf: False
+  # @param save_secret [Boolean] Indicates whether the confidential parts
+  #        of the credentials should be saved, Defaulf: False
   # @return [Object] The Sync created with requested params
-  def add_sync(access_id, disable_notifications = false, redirect_uri = nil, state = nil, _credentials = nil, save_secret = false)
-    data = {
-      disable_notifications: disable_notifications,
-      redirect_uri: redirect_uri,
-      state: state,
-      cedentials: cendentials,
-      save_secret: save_secret
-    }.delete_if { |_k, v| v.nil? }
-
-    query_api_object Sync, "rest/accesses/#{access_id}/syncs", data = data, method = 'POST'
+  def add_sync(access_id, options)
+    data = options.delete_if { |_, v| v.nil? }
+    query_api_object Sync, "rest/accesses/#{access_id}/syncs", data, 'POST'
   end
 
   # Get synchronization status
@@ -29,6 +24,6 @@ def add_sync(access_id, disable_notifications = false, redirect_uri = nil, state
   # @param sync_id [String] Figo ID of the sync to get
   # @return [Object] The Sync created with requested params
   def get_synchronisation_status(access_id, sync_id)
-    query_api_object Sync, "rest/accesses/#{access_id}/syncs/#{sync_id}", method = 'GET'
+    query_api_object Sync, "rest/accesses/#{access_id}/syncs/#{sync_id}", 'GET'
   end
 end
diff --git a/lib/synchronization_status/api_call.rb b/lib/synchronization_status/api_call.rb
index b72f342..dc3bea6 100644
--- a/lib/synchronization_status/api_call.rb
+++ b/lib/synchronization_status/api_call.rb
@@ -8,9 +8,10 @@ module Figo
   # @param state [String] This string will be passed on through the complete synchronization process
   # @return [String] The result parameter is the URL to be opened by the user.
   def get_sync_url(redirect_uri, state)
-    res = query_api '/rest/sync', { redirect_uri: redirect_uri, state: state }.to_query, 'POST'
+    data = { redirect_uri: redirect_uri, state: state }.to_query
+    res = query_api '/rest/sync', data, 'POST'
 
-    'https://' + Config.api_endpoint + '/task/start?id=' + res['task_token']
+    "https://#{API_ENDPOINT}/task/start?id=#{res['task_token']}"
   end
 
   # Retrieve the URL a user should open in the web browser to start the synchronization process.
@@ -22,8 +23,9 @@ def get_sync_url(redirect_uri, state)
   # @param if_not_synced_since [Integer] if this parameter is set, only those accounts will be
   #        synchronized, which have not been synchronized within the specified number of minutes.
   # @return [String] the URL to be opened by the user.
-  def sync_url(redirect_uri, state, if_not_synced_since = 0)
-    response = query_api '/rest/sync', { 'redirect_uri' => redirect_uri, 'state' => state, 'if_not_synced_since' => if_not_synced_since }, 'POST'
-    "https://#{$api_endpoint}/task/start?id=#{response['task_token']}"
+  def sync_url(redirect_uri, state, if_not_synced_since)
+    data = { redirect_uri: redirect_uri, state: state, if_not_synced_since: if_not_synced_since }.to_query
+    response = query_api '/rest/sync', data, 'POST'
+    "https://#{API_ENDPOINT}/task/start?id=#{response['task_token']}"
   end
 end
diff --git a/lib/task/api_call.rb b/lib/task/api_call.rb
index c4b5159..597ab16 100644
--- a/lib/task/api_call.rb
+++ b/lib/task/api_call.rb
@@ -14,14 +14,16 @@ def start_task(task_token)
   # @param task [Object] - Task object
   # @param options [Object] - further options (optional)
   #    @param options.pin [Boolean] - submit PIN
-  #    @param options.continue [Boolean] - this flag signals to continue after an error condition or to skip a PIN or challenge-response entry
-  #    @param options.save_pin [Boolean] - this flag indicates whether the user has chosen to save the PIN on the figo Connect server
+  #    @param options.continue [Boolean] - this flag signals to continue after an error condition or
+  #                                        to skip a PIN or challenge-response entry
+  #    @param options.save_pin [Boolean] - this flag indicates whether the user has chosen to
+  #                                        save the PIN on the figo Connect server
   #    @param options.response [Boolean] - submit response to challenge
   # @return [TaskState] The result parameter is a TaskState object which represents the current status of the task.
   def get_task_state(task, options)
     options ||= {}
     options['id'] = task['task_token']
-    options.save_pin ||= 0 if options.pin
+    options.save_pin ||= 0 if options['pin']
     options.continue ||= 0
 
     query_api_object TaskState, '/task/progress?id=' + task.task_token, options.to_query, 'POST', nil
diff --git a/lib/task/model.rb b/lib/task/model.rb
index de8fe86..477f4df 100644
--- a/lib/task/model.rb
+++ b/lib/task/model.rb
@@ -29,7 +29,8 @@ def initialize(session, json)
     # @param is_waiting_for_pin [Boolean] - The figo Connect server is waiting for PIN
     attr_accessor :is_waiting_for_pin
 
-    # @param is_waiting_for_response [Boolean] - The figo Connect server is waiting for a response to the parameter challenge
+    # @param is_waiting_for_response [Boolean] - The figo Connect server is waiting for
+    #                                            a response to the parameter challenge
     attr_accessor :is_waiting_for_response
 
     # @param is_erroneous [Boolean] - An error occured and the figo Connect server is waiting for continuation
diff --git a/lib/transaction/api_call.rb b/lib/transaction/api_call.rb
index 8b77eda..7b57ba0 100644
--- a/lib/transaction/api_call.rb
+++ b/lib/transaction/api_call.rb
@@ -27,6 +27,15 @@ module Figo
   #                                 be included in the response. Pending transactions are always
   #                                 included as a complete set, regardless of the `since` parameter.
   #           include_statistics (bool): Includes statistics on the returned transactionsif true, Default: false.
+=======
+  # @param account_id [String] ID of the account for which to list the transactions
+  # @param since [String, Date] this parameter can either be a transaction ID or a date
+  # @param count [Integer] limit the number of returned transactions
+  # @param offset [Integer] which offset into the result set should be used to determin the first
+  #                         transaction to return (useful in combination with count)
+  # @param include_pending [Boolean] this flag indicates whether pending transactions should be included
+  #        in the response; pending transactions are always included as a complete set, regardless of
+  #        the `since` parameter
   # @return [Array] an array of `Transaction` objects, one for each transaction of the user
   def list_transactions(options)
     path =  "/rest/transactions?#{encodeOptions options}"
diff --git a/test/setup.rb b/test/setup.rb
index 1f7c33a..f765eea 100644
--- a/test/setup.rb
+++ b/test/setup.rb
@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
+require 'flt'
+require 'minitest/autorun'
+require 'minitest/reporters'
 require 'securerandom'
 
+require_relative '../lib/figo'
+
 module Setup
-  def setup(no_user = false)
-    @no_user ||= no_user
+  Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+  def setup
     @username ||= "#{SecureRandom.alphanumeric(8)}@test.com"
     @password ||= 'password'
     @client_id ||= 'CaESKmC8MAhNpDe5rvmWnSkRE_7pkkVIIgMwclgzGcQY'
     @client_secret ||= 'STdzfv0GXtEj_bwYn7AgCVszN1kKq5BdgEIKOM_fzybQ'
-    create_user unless @no_user
-  end
-
-  def teardown
-    destroy_user unless @no_user
   end
 
   private
diff --git a/test/test_account_sync_and_setup.rb b/test/test_account_sync_and_setup.rb
index 8e1ba6c..872003a 100644
--- a/test/test_account_sync_and_setup.rb
+++ b/test/test_account_sync_and_setup.rb
@@ -22,40 +22,32 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
-
-class FigoTest < MiniTest::Unit::TestCase
-  def setup
-    @sut = Figo::Session.new(CONFIG['ACCESS_TOKEN'])
-  end
+require_relative 'setup'
 
+class FigoTest < MiniTest::Spec
   ##   Account Setup & Synchronization
   # Retrieve List of Supported Banks, Credit Cards, other Payment Services
   def test_retrieve_list_of_supported_baks_cards_services
-    assert_nil @sut.get_supported_payment_services('DE', 'whatever')
+    assert_nil figo_session.get_supported_payment_services('DE', 'whatever')
   end
 
   # Retrieve List of Supported Credit Cards and other Payment Services
   def test_retrieve_list_of_supported_cards_services
-    assert_nil @sut.get_supported_payment_services('DE', 'services')
+    assert_nil figo_session.get_supported_payment_services('DE', 'services')
   end
 
   # Retrieve List of all Supported Banks
   def test_retreive_list_of_all_supported_banks
-    assert_raises(Figo::Error) { @sut.get_supported_payment_services('DE', 'banks') }
+    assert_raises(Figo::Error) { figo_session.get_supported_payment_services('DE', 'banks') }
   end
 
   # Retrieve Login Settings for a Bank or Service
   def test_retreive_login_settings_for_a_bank_or_service
-    assert_raises(Figo::Error) { @sut.find_bank('B1.1') }
+    assert_raises(Figo::Error) { figo_session.find_bank('B1.1') }
   end
 
   # Setup New Bank Account
   def test_setup_new_bank_account
-    assert @sut.get_bank('B1.1')
+    assert figo_session.get_bank('B1.1')
   end
 end
diff --git a/test/test_accounts.rb b/test/test_accounts.rb
index c880f04..463cceb 100644
--- a/test/test_accounts.rb
+++ b/test/test_accounts.rb
@@ -22,83 +22,75 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
-
-class FigoTest < MiniTest::Unit::TestCase
-  def setup
-    @sut = Figo::Session.new(CONFIG['ACCESS_TOKEN'])
-  end
+require_relative 'setup'
 
+class FigoTest < MiniTest::Spec
   ##   Accounts
   # Retrieve Bank Account
   def test_retrieve_bank_account
-    account = @sut.get_account 'A1.2'
+    account = figo_session.get_account 'A1.2'
     assert_equal account.account_id, 'A1.2'
   end
 
   # Retrieve all Bank Accounts
   def test_retreive_all_bank_accounts
-    accounts = @sut.accounts
+    accounts = figo_session.accounts
     assert !accounts.empty?
   end
 
   # Retrieve Bank Account Balance and Limits
   def test_retreive_bank_account_balance_and_limits
-    assert @sut.get_account_balance('A1.2')
+    assert figo_session.get_account_balance('A1.2')
   end
 
   # Modify Bank Account
   def test_modify_bank_account
-    account = @sut.get_account 'A1.2'
+    account = figo_session.get_account 'A1.2'
     account.name = 'new name'
 
-    execption = assert_raises(Figo::Error) { @sut.modify_account account }
+    execption = assert_raises(Figo::Error) { figo_session.modify_account account }
     assert 'Missing, invalid or expired access token.', execption.message
-    # @sut.modify_account account
+    # figo_session.modify_account account
 
-    # modified_account = @sut.get_account "A1.2"
+    # modified_account = figo_session.get_account "A1.2"
     # assert_equal modified_account.name "new name"
   end
 
   # Set Bank Account Sort Order
   def test_set_account_sort_order
-    accounts = @sut.accounts
-    execption = assert_raises(Figo::Error) { @sut.account_sort_order(accounts) }
+    accounts = figo_session.accounts
+    execption = assert_raises(Figo::Error) { figo_session.account_sort_order(accounts) }
     assert 'Missing, invalid or expired access token.', execption.message
 
-    # assert @sut.account_sort_order(accounts)
+    # assert figo_session.account_sort_order(accounts)
   end
 
   # Delete bank account
   def test_delete_bank_account
-    execption = assert_raises(Figo::Error) { @sut.remove_account('A1.2') }
+    execption = assert_raises(Figo::Error) { figo_session.remove_account('A1.2') }
     assert 'Missing, invalid or expired access token.', execption.message
 
-    # assert_nil @sut.remove_account("A1.2")
+    # assert_nil figo_session.remove_account("A1.2")
   end
 
   # Modify Bank Account Credit Line and Limits
   def test_modify_bank_account_credit_line_and_limits
-    old_balance = @sut.get_account_balance('A1.2')
+    old_balance = figo_session.get_account_balance('A1.2')
     balance = old_balance.clone
 
     balance.balance = 1
 
-    execption = assert_raises(Figo::Error) { @sut.modify_account_balance('A1.2', balance) }
+    execption = assert_raises(Figo::Error) { figo_session.modify_account_balance('A1.2', balance) }
     assert 'Missing, invalid or expired access token.', execption.message
-    # new_balance = @sut.modify_account_balance("A1.2", balance)
+    # new_balance = figo_session.modify_account_balance("A1.2", balance)
 
     # assert old_balance.balance != new_balance.balance
   end
 
   # Remove Stored Pin from Bank Account
   def test_remove_pin_from_bank_account
-    new_bank_info = Figo::Bank.new(@sut, bank_id: 'B1.1', sepa_creditor_id: 'DE02ZZZ0123456789', save_pin: true)
-    response = @sut.remove_bank_pin(new_bank_info)
+    new_bank_info = Figo::Bank.new(figo_session, bank_id: 'B1.1', sepa_creditor_id: 'DE02ZZZ0123456789', save_pin: true)
+    response = figo_session.remove_bank_pin(new_bank_info)
     assert response['save_pin'] == false
   end
 end
diff --git a/test/test_authentififcation.rb b/test/test_authentififcation.rb
index 439588e..23c8c34 100644
--- a/test/test_authentififcation.rb
+++ b/test/test_authentififcation.rb
@@ -22,17 +22,14 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
+  before { create_user }
+  after { destroy_user }
+
   def test_user_credential_request
     response = figo_connection.user_credential_request(username, password)
     assert response['access_token']
diff --git a/test/test_catalog.rb b/test/test_catalog.rb
index bddf2de..e0e5662 100644
--- a/test/test_catalog.rb
+++ b/test/test_catalog.rb
@@ -1,13 +1,8 @@
 # frozen_string_literal: true
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
   def test_get_catalog_client_auth
@@ -17,9 +12,11 @@ def test_get_catalog_client_auth
   end
 
   def test_get_catalog_user_auth
+    create_user
     response = figo_session.get_supported_payment_services
     assert response.services.instance_of? Array
     assert response.banks.instance_of? Array
+    destroy_user
   end
 
   # Works but `GET /catalog` is very slow
diff --git a/test/test_figo.rb b/test/test_figo.rb
index 227fe32..853c1cb 100644
--- a/test/test_figo.rb
+++ b/test/test_figo.rb
@@ -22,16 +22,9 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
-require 'yaml'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
-  CONFIG = YAML.load_file(File.join(__dir__, 'config.yml'))
+class FigoTest < MiniTest::Spec
   include Setup
 
   def test_missing_handling
diff --git a/test/test_notifications.rb b/test/test_notifications.rb
index 48c9b16..2fac6a2 100644
--- a/test/test_notifications.rb
+++ b/test/test_notifications.rb
@@ -22,16 +22,14 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
+  before { create_user }
+  after { destroy_user }
+
   ##  Notifications & Web Hooks
   # Retrieve all Notifications
   def test_retrieve_all_notifications
@@ -41,44 +39,46 @@ def test_retrieve_all_notifications
 
   # Create a New Notification
   def test_create_new_notification
-    added_notification = figo_session.add_notification(Figo::Notification.new(figo_session, observe_key: '/rest/transactions', notify_uri: 'http://figo.me/test', state: 'qwe'))
-
     refute_nil added_notification.notification_id
-    assert_equal added_notification.observe_key, '/rest/transactions'
-    assert_equal added_notification.notify_uri, 'http://figo.me/test'
-    assert_equal added_notification.state, 'qwe'
+    assert_equal added_notification.observe_key, notification.observe_key
+    assert_equal added_notification.notify_uri, notification.notify_uri
+    assert_equal added_notification.state, notification.state
   end
 
   # Retrieve one Specific Notification
   def test_retrieve_one_specific_notification
-    added_notification = figo_session.add_notification(Figo::Notification.new(figo_session, observe_key: '/rest/transactions', notify_uri: 'http://figo.me/test', state: 'qwe'))
-
     retrieved_notification = figo_session.get_notification(added_notification.notification_id)
-
     assert_equal retrieved_notification.notification_id, added_notification.notification_id
-    assert_equal retrieved_notification.observe_key, '/rest/transactions'
-    assert_equal retrieved_notification.notify_uri, 'http://figo.me/test'
-    assert_equal retrieved_notification.state, 'qwe'
+    assert_equal retrieved_notification.observe_key, notification.observe_key
+    assert_equal retrieved_notification.notify_uri, notification.notify_uri
+    assert_equal retrieved_notification.state, notification.state
   end
 
   # Modify Single Notification
   def test_modify_single_notification
-    added_notification = figo_session.add_notification(Figo::Notification.new(figo_session, observe_key: '/rest/transactions', notify_uri: 'http://figo.me/test', state: 'qwe'))
-
     added_notification.state = 'asd'
     modified_notification = figo_session.modify_notification(added_notification)
-
-    assert_equal modified_notification.notification_id, added_notification.notification_id
-    assert_equal modified_notification.observe_key, '/rest/transactions'
-    assert_equal modified_notification.notify_uri, 'http://figo.me/test'
     assert_equal modified_notification.state, 'asd'
   end
 
   # Delete Notification
   def test_delete_notification
-    added_notification = figo_session.add_notification(Figo::Notification.new(figo_session, observe_key: '/rest/transactions', notify_uri: 'http://figo.me/test', state: 'qwe'))
-
     figo_session.remove_notification(added_notification)
     assert_nil figo_session.get_notification(added_notification.notification_id)
   end
+
+  private
+
+  def added_notification
+    @added_notification ||= figo_session.add_notification(notification)
+  end
+
+  def notification
+    @notification ||= Figo::Notification.new(
+      figo_session,
+      observe_key: '/rest/transactions',
+      notify_uri: 'http://figo.me/test',
+      state: 'qwe'
+    )
+  end
 end
diff --git a/test/test_payments.rb b/test/test_payments.rb
index 237d35b..e6b1938 100644
--- a/test/test_payments.rb
+++ b/test/test_payments.rb
@@ -22,22 +22,18 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
-  i_suck_and_my_tests_are_order_dependent!
+  before { create_user }
+  after { destroy_user }
 
   ##  Payments
   # Retrieve all Payments
   def test_retrieve_all_payments
-    session = figo_session(scope = 'accounts=rw user=rw payments=rw')
+    session = figo_session('accounts=rw user=rw payments=rw')
     payments = session.payments
     assert payments.instance_of?(Array)
   end
diff --git a/test/test_securities.rb b/test/test_securities.rb
index 7e3c6ff..30b9c50 100644
--- a/test/test_securities.rb
+++ b/test/test_securities.rb
@@ -22,16 +22,14 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
+  before { create_user }
+  after { destroy_user }
+
   # Retrieve Securities of all Accounts
   def test_retreive_securities_of_all_accounts
     assert figo_session.get_securities({})
diff --git a/test/test_standing_orders.rb b/test/test_standing_orders.rb
index fbbb57f..a914bb8 100644
--- a/test/test_standing_orders.rb
+++ b/test/test_standing_orders.rb
@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
-
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
+  before { create_user }
+  after { destroy_user }
+
   ##  Standing orders
   # Retrieve all Standing orders
   def test_retrieve_all_standing_orders
diff --git a/test/test_transactions.rb b/test/test_transactions.rb
index 11613e5..d76ae9d 100644
--- a/test/test_transactions.rb
+++ b/test/test_transactions.rb
@@ -22,14 +22,9 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
   # Retrieve Transactions of all Accounts
diff --git a/test/test_user_management.rb b/test/test_user_management.rb
index db173e8..a1c3b1e 100644
--- a/test/test_user_management.rb
+++ b/test/test_user_management.rb
@@ -22,21 +22,11 @@
 # THE SOFTWARE.
 #
 
-require 'flt'
-require 'minitest/autorun'
-require 'minitest/reporters'
-
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
-require_relative '../lib/figo'
 require_relative 'setup'
 
-class FigoTest < MiniTest::Unit::TestCase
+class FigoTest < MiniTest::Spec
   include Setup
 
-  def setup
-    super(no_user = true)
-  end
-
   def test_user_management
     assert create_user # Create User
     assert figo_session.get_user # Get User
diff --git a/web_demo/app.rb b/web_demo/app.rb
deleted file mode 100644
index 9edb1b5..0000000
--- a/web_demo/app.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'sinatra'
-require_relative '../lib/figo'
-
-CLIENT_ID = 'CaESKmC8MAhNpDe5rvmWnSkRE_7pkkVIIgMwclgzGcQY'
-CLIENT_SECRET = 'STdzfv0GXtEj_bwYn7AgCVszN1kKq5BdgEIKOM_fzybQ'
-connection = Figo::Connection.new(CLIENT_ID, CLIENT_SECRET, 'http://localhost:3000/callback')
-
-configure do
-  enable :sessions
-  set :port, 3000
-end
-
-get '/callback*' do
-  raise Exception, 'Bogus redirect, wrong state' if params['state'] != 'qweqwe'
-
-  token_hash = connection.obtain_access_token(params['code'])
-  request.session['figo_token'] = token_hash['access_token']
-
-  redirect to('/')
-end
-
-get '/logout' do
-  request.session['figo_token'] = nil
-  redirect to('/')
-end
-
-before '/' do
-  unless session[:figo_token] || (request.path_info == '/callback')
-    redirect to(connection.login_url('qweqwe', 'accounts=ro transactions=ro balance=ro user=ro'))
-  end
-end
-
-get '/:account_id' do |account_id|
-  session = Figo::Session.new(request.session['figo_token'])
-  @accounts = session.accounts
-  @current_account = session.get_account(account_id)
-  @transactions = @current_account.transactions
-  @user = session.user
-
-  erb :index
-end
-
-get '/' do
-  session = Figo::Session.new(request.session['figo_token'])
-  @accounts = session.accounts
-  @current_account = nil
-  @transactions = session.transactions
-  @user = session.user
-
-  erb :index
-end
diff --git a/web_demo/public/banking.css b/web_demo/public/banking.css
deleted file mode 100644
index 5e3ea3a..0000000
--- a/web_demo/public/banking.css
+++ /dev/null
@@ -1 +0,0 @@
-body { padding-top: 70px; }
diff --git a/web_demo/public/favicon.ico b/web_demo/public/favicon.ico
deleted file mode 100644
index a9d58c7..0000000
Binary files a/web_demo/public/favicon.ico and /dev/null differ
diff --git a/web_demo/views/index.erb b/web_demo/views/index.erb
deleted file mode 100644
index 7d8efcf..0000000
--- a/web_demo/views/index.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<h1><%= @current_account.nil? ? "Unified Inbox" : @current_account.name %></h1>
-
-<% if @current_account %>
-  <div class="panel panel-default">
-    <div class="panel-heading">Account Details</div>
-    <div class="panel-body">
-      <ul class="list-group">
-        <li class="list-group-item">Owner: <%= @current_account.owner %></li>
-        <li class="list-group-item">Account Number: <%= @current_account.account_number %></li>
-        <li class="list-group-item">Bank Code: <%= @current_account.bank_code %></li>
-        <li class="list-group-item">IBAN: <%= @current_account.iban %></li>
-        <li class="list-group-item">Balance: <%= @current_account.balance.balance %> <%= @current_account.currency %></li>
-      </ul>
-    </div>
-  </div>
-<% end %>
-
-<table class="table table-hover table-condensed">
-  <thead><tr>
-    <th>Date</th>
-    <th>Name</th>
-    <th>Account Number</th>
-    <th>Purpose</th>
-    <th style="text-align: right;">Amount</th>
-  </tr></thead>
-  <tbody>
-    <% @transactions.each do |transaction| %>
-      <tr>
-        <td><%= transaction.value_date %></td>
-        <td><%= transaction.name %></td>
-        <td><%= transaction.account_number %></td>
-        <td><%= transaction.purpose %></td>
-        <td style="text-align: right; <% if transaction.amount < 0 %>color: red;<% end %>"><%= transaction.amount %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
diff --git a/web_demo/views/layout.erb b/web_demo/views/layout.erb
deleted file mode 100644
index cffd8b1..0000000
--- a/web_demo/views/layout.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>figo web banking</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-		<!-- Bootstrap -->
-		<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-
-		<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-		<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-		<!--[if lt IE 9]>
-		  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-		  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
-		<![endif]-->
-
-		<link href="/favicon.ico" rel="shortcut icon" />
-		<link href="/banking.css" rel="stylesheet" media="screen" />
-
-	</head>
-	<body>
-		<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-			<div class="container-fluid">
-			  <div class="navbar-header">
-			    <a class="navbar-brand" href="/">figo web banking</a>
-			  </div>
-			  <div class="navbar-collapse collapse">
-					<ul class="nav navbar-nav">
-							<li <% if @current_account.nil? %> class="active"<% end %>><a href="/">Unified Inbox</a></li>
-							<% @accounts.each do |account| %>
-									<li <% if !@current_account.nil? and @current_account.account_id == account.account_id %>class="active" <% end %>><a href="/<%= account.account_id %>"><%= account.name %></a></li>
-							<% end %>
-					</ul>
-					<p class="navbar-text navbar-right">Signed in as <a href="/logout" class="navbar-link"><%= @user.email %></a></p>
-			  </div><!--/.nav-collapse -->
-			</div>
-		</div>
-
-		<div class="container-fluid" role="main">
-			<%if @error then %>
-				<div class="alert alert-error"><%=@error%></div>
-			<% end %>
-			<%= yield %>
-		</div>
-
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-  </body>
-</html>