Deadcode fixing