Removes redundant code from welcome view controller
Merge branch 'fix/cleanup' into develop

* fix/cleanup:
  Removes redundant code from welcome view controller