remove database.yml from Gemfile
move more user attributes to billing_address