diff --git a/dot_config/nvim/lua/tap/plugins/lualine.lua b/dot_config/nvim/lua/tap/plugins/lualine.lua
index 7c30a784..50758908 100644
--- a/dot_config/nvim/lua/tap/plugins/lualine.lua
+++ b/dot_config/nvim/lua/tap/plugins/lualine.lua
@@ -41,44 +41,6 @@ return {
         return comp
       end
 
-      ---Copied from lualine.component and modified to allow empty status to render
-      ---driver code of the class
-      ---@param default_highlight string default hl group of section where component resides
-      ---@param is_focused boolean|number whether drawing for active or inactive statusline.
-      ---@return string stl formatted rendering string for component
-      local empty_draw = function(self, default_highlight, is_focused)
-        self.status = ''
-        self.applied_separator = ''
-        if self.options.cond ~= nil and self.options.cond() ~= true then
-          return self.status
-        end
-        self.default_hl = default_highlight
-        local status = self:update_status(is_focused)
-        if self.options.fmt then
-          status = self.options.fmt(status or '', self)
-        end
-        -- if type(status) == 'string' and #status > 0 then
-        self.status = status
-        self:apply_icon()
-        self:apply_padding()
-        self:apply_on_click()
-        self:apply_highlights(default_highlight)
-        self:apply_section_separators()
-        self:apply_separator()
-        -- end
-        return self.status
-      end
-
-      local filetype = require('lualine.components.filetype'):extend()
-      function filetype:draw(...)
-        return empty_draw(self, ...)
-      end
-
-      local diagnostic_empty = require('lualine.components.diagnostics'):extend()
-      function diagnostic_empty:draw(...)
-        return empty_draw(self, ...)
-      end
-
       local function modified()
         if vim.bo.modified then
           return ''
@@ -123,7 +85,8 @@ return {
 
       local diagnostic_section = function(cfg)
         local default_cfg = {
-          diagnostic_empty,
+          'diagnostics',
+          draw_empty = true,
           source = { 'nvim_diagnostic' },
           separator = {
             left = section_separators.right,
@@ -252,7 +215,8 @@ return {
         lualine_y = {
           literal ' ',
           {
-            filetype,
+            'filetype',
+            draw_empty = true,
             colored = false,
             padding = 0,
             fmt = function(status)
@@ -301,14 +265,6 @@ return {
       local winbar_y = {
         project_name(),
       }
-      local filetype_icon_only = {
-        filetype,
-        colored = false,
-        padding = 0,
-        fmt = function()
-          return ''
-        end,
-      }
 
       require('lualine').setup {
         options = {