diff --git a/cicm_web/Controllers/CompanyController.cs b/cicm_web/Controllers/CompanyController.cs
index 5860957c..365cbee0 100644
--- a/cicm_web/Controllers/CompanyController.cs
+++ b/cicm_web/Controllers/CompanyController.cs
@@ -32,7 +32,6 @@ using System.Linq;
 using Cicm.Database.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 
 namespace cicm_web.Controllers
 {
@@ -69,9 +68,6 @@ namespace cicm_web.Controllers
 
             if(company == null) return Index();
 
-            ViewBag.LastLogo     = company.CompanyLogos.OrderByDescending(l => l.Year).FirstOrDefault();
-            ViewBag.CompanyLogos = company.CompanyLogos.OrderByDescending(l => l.Year).ToList();
-
             return View(company);
         }
 
diff --git a/cicm_web/Views/Company/ByCountry.cshtml b/cicm_web/Views/Company/ByCountry.cshtml
index 31a0abf9..1ed37e58 100644
--- a/cicm_web/Views/Company/ByCountry.cshtml
+++ b/cicm_web/Views/Company/ByCountry.cshtml
@@ -32,7 +32,7 @@
     ViewData["Title"] = "Companies";
 }
 @using System.IO
-@using Company = Cicm.Database.Models.Company
+@using Cicm.Database.Models
 @model Cicm.Database.Models.Company[]
 
 <p align="center">
@@ -68,7 +68,6 @@
                 <a asp-controller="Company"
                    asp-action="View"
                    asp-route-id="@company.Id">
-                    @* TODO
                     @if(company.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", company.LastLogo.Guid + ".svg")))
                     {
                         <picture>
@@ -88,7 +87,6 @@
                                  style="max-height: 32px; max-width: 128px" />
                         </picture>
                     }
-                    *@
                     @company.Name
                 </a>
                 <br />
diff --git a/cicm_web/Views/Company/ByLetter.cshtml b/cicm_web/Views/Company/ByLetter.cshtml
index 66e84889..7fb31b38 100644
--- a/cicm_web/Views/Company/ByLetter.cshtml
+++ b/cicm_web/Views/Company/ByLetter.cshtml
@@ -31,7 +31,8 @@
 
     ViewData["Title"] = "Companies";
 }
-@using Company = Cicm.Database.Models.Company
+@using System.IO
+@using Cicm.Database.Models
 @model Cicm.Database.Models.Company[]
 
 <p>Search results:</p>
@@ -51,7 +52,6 @@
                 <a asp-controller="Company"
                    asp-action="View"
                    asp-route-id="@company.Id">
-                    @*
                     @if(company.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", company.LastLogo.Guid + ".svg")))
                     {
                         <picture>
@@ -71,7 +71,6 @@
                                  style="max-height: 32px; max-width: 128px" />
                         </picture>
                     }
-                    *@
                     @company.Name
                 </a>
                 <br />
diff --git a/cicm_web/Views/Company/Index.cshtml b/cicm_web/Views/Company/Index.cshtml
index 1b1c2311..13f90516 100644
--- a/cicm_web/Views/Company/Index.cshtml
+++ b/cicm_web/Views/Company/Index.cshtml
@@ -31,7 +31,8 @@
 
     ViewData["Title"] = "Companies";
 }
-@using Company = Cicm.Database.Models.Company
+@using System.IO
+@using Cicm.Database.Models
 @model Cicm.Database.Models.Company[]
 
 <p align="center">
@@ -44,7 +45,6 @@
                 <a asp-controller="Company"
                    asp-action="View"
                    asp-route-id="@company.Id">
-                    @* TODO
                     @if(company.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", company.LastLogo.Guid + ".svg")))
                     {
                         <picture>
@@ -63,9 +63,7 @@
                                  width="auto"
                                  style="max-height: 32px; max-width: 128px" />
                         </picture>
-
                     }
-                    *@
                     @company.Name
                 </a>
                 <br />
diff --git a/cicm_web/Views/Company/View.cshtml b/cicm_web/Views/Company/View.cshtml
index 3b181fad..32fc4fd7 100644
--- a/cicm_web/Views/Company/View.cshtml
+++ b/cicm_web/Views/Company/View.cshtml
@@ -34,26 +34,25 @@
 @using System.IO
 @using Cicm.Database
 @using Cicm.Database.Models
-@using Machine = Cicm.Database.Models.Machine
 @model Cicm.Database.Models.Company
 
 @if(Model != null)
 {
     <div class="container-fluid">
     <p align=center>
-        @if(ViewBag.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", ViewBag.LastLogo.Guid + ".svg")))
+        @if(Model.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", Model.LastLogo.Guid + ".svg")))
         {
             <picture>
                 <source type="image/svg+xml"
-                        srcset="/assets/logos/@(ViewBag.LastLogo.Guid).svg">
+                        srcset="/assets/logos/@(Model.LastLogo.Guid).svg">
                 <source type="image/webp"
-                        srcset="/assets/logos/webp/1x/@(ViewBag.LastLogo.Guid).webp,
-    /assets/logos/webp/1x/@(ViewBag.LastLogo.Guid).webp 2x,
-    /assets/logos/webp/1x/@(ViewBag.LastLogo.Guid).webp 3x">
-                <img srcset="/assets/logos/png/1x/@(ViewBag.LastLogo.Guid).png,
-                             /assets/logos/png/1x/@(ViewBag.LastLogo.Guid).png 2x,
-                             /assets/logos/png/1x/@(ViewBag.LastLogo.Guid).webp 3x"
-                     src="/assets/logos/png/1x@(ViewBag.LastLogo.Guid).png")
+                        srcset="/assets/logos/webp/1x/@(Model.LastLogo.Guid).webp,
+    /assets/logos/webp/1x/@(Model.LastLogo.Guid).webp 2x,
+    /assets/logos/webp/1x/@(Model.LastLogo.Guid).webp 3x">
+                <img srcset="/assets/logos/png/1x/@(Model.LastLogo.Guid).png,
+                             /assets/logos/png/1x/@(Model.LastLogo.Guid).png 2x,
+                             /assets/logos/png/1x/@(Model.LastLogo.Guid).webp 3x"
+                     src="/assets/logos/png/1x@(Model.LastLogo.Guid).png")
                      alt=""
                      height="auto"
                      width="auto"
@@ -65,7 +64,7 @@
     @{
         string carrouselActive = "active";
     }
-    @if(ViewBag.Logos != null && ViewBag.Logos.Length > 1)
+    @if(Model.Logos != null && Model.Logos.Count > 1)
     {
         <div class="col-3">
             <div class="carousel slide"
@@ -74,7 +73,7 @@
                 <div class="carousel-inner">
 
 
-                    @foreach(CompanyLogo logo in ViewBag.Logos)
+                    @foreach(CompanyLogo logo in Model.Logos)
                     {
                         if(File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", logo.Guid + ".svg")))
                         {
diff --git a/cicm_web/Views/Machine/View.cshtml b/cicm_web/Views/Machine/View.cshtml
index 168646cb..9e89ce2e 100644
--- a/cicm_web/Views/Machine/View.cshtml
+++ b/cicm_web/Views/Machine/View.cshtml
@@ -34,11 +34,7 @@
 @using System.IO
 @using Cicm.Database
 @using Cicm.Database.Models
-@using MemoryByMachine = Cicm.Database.Models.MemoryByMachine
-@using SoundByMachine = Cicm.Database.Models.SoundByMachine
-@using StorageByMachine = Cicm.Database.Models.StorageByMachine
 @model Cicm.Database.Models.Machine
-@* TODO
 <p align="center">
     @if(Model.Company.LastLogo != null && File.Exists(System.IO.Path.Combine(ViewBag.WebRootPath, "assets/logos", Model.Company.LastLogo.Guid + ".svg")))
     {
@@ -60,7 +56,6 @@
         </picture>
     }
 </p>
-*@
 
 @{ int counter = 0; }
 
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index a3e2e363..37b1e90d 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <Version>3.0.99.302</Version>
+    <Version>3.0.99.304</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>