diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
index fb5d8591c09..60f86c74df0 100644
--- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
+++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
@@ -16,8 +16,8 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
     say("Projects and Github projects with a wrong URL. It also migrates Gitlab project credentials.")
     in_transaction { process_projects_with_wrong_url }
 
-    say("Migrating bitbucket credentials...")# TODO remove last param
-    in_transaction { process_project(import_type: 'bitbucket', unencrypted_data: ['repo', 'user_map']) }
+    say("Migrating bitbucket credentials...")
+    in_transaction { process_project(import_type: 'bitbucket') }
 
     say("Migrating fogbugz credentials...")
     in_transaction { process_project(import_type: 'fogbugz', unencrypted_data: ['repo', 'user_map']) }
diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb
index fffeb66ce26..5c1c1c4865a 100644
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
@@ -8,7 +8,7 @@ module Gitlab
 
         import_data = project.import_data.try(:data)
         repo_data = import_data['repo'] if import_data
-        if defined?(repo_data)
+        if repo_data
           @repo = FogbugzImport::Repository.new(repo_data)
           @known_labels = Set.new
         else
@@ -18,7 +18,6 @@ module Gitlab
 
       def execute
         return true unless repo.valid?
-        Rails.logger.error import_data_credentials.inspect
         client = Gitlab::FogbugzImport::Client.new(token: import_data_credentials['fb_session']['token'], uri: import_data_credentials['fb_session']['uri'])
 
         @cases = client.cases(@repo.id.to_i)