diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d053b4e..9e93438 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,44 +1,28 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
 FROM ubuntu:focal
 
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    # Restore man command
-    && yes | unminimize 2>&1 
-
 ENV LANG="C.UTF-8"
 
 # Install basic build tools
 RUN apt-get update \
     && apt-get upgrade -y \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         make \
         unzip \
+        zip \
         build-essential \
         libsdl2-dev \
         libglew-dev \
         libgtk-3-dev \
         gdb \
+        vim \
+        cmake \
     && rm -rf /var/lib/apt/lists/*
-
-# Verify expected build and debug tools are present
-RUN apt-get update \
-    && apt-get -y install build-essential cmake cppcheck valgrind clang lldb llvm gdb python3-dev \
-    # Install tools and shells not in common script
-    && apt-get install -yq vim vim-doc xtail software-properties-common libsecret-1-dev \
-    # Clean up
     && apt-get autoremove -y && apt-get clean -y
 
 # Default to bash shell (other shells available at /usr/bin/fish and /usr/bin/zsh)
 ENV SHELL=/usr/bin/zsh \
     DOCKER_BUILDKIT=1
 
-# Remove scripts now that we're done with them
-RUN apt-get clean -y && rm -rf /tmp/scripts
-
 # Mount for docker-in-docker 
 VOLUME [ "/var/lib/docker" ]