diff --git a/fsw/for_build/Makefile b/fsw/for_build/Makefile
deleted file mode 100644
index 8c07d1a..0000000
--- a/fsw/for_build/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-###############################################################################
-# File: CFS Application Makefile 
-#
-# $Id: Makefile 1.6 2009/07/09 11:41:26EDT rmcgraw Exp  $
-#
-# $Log: Makefile  $
-# Revision 1.6 2009/07/09 11:41:26EDT rmcgraw 
-# DCR8291:1 Changed CFE_MISSION_INC to CFS_MISSION_INC and added log if needed
-#
-###############################################################################
-#
-# Subsystem produced by this makefile.
-#
-APPTARGET = sample_lib
-
-# 
-# Entry Point for task
-# 
-ENTRY_PT = SAMPLE_LibInit 
-
-#
-# Object files required to build subsystem.
-#
-OBJS = sample_lib.o
-
-#
-# Source files required to build subsystem; used to generate dependencies.
-# As long as there are no assembly files this can be automated.
-#
-SOURCES = $(OBJS:.o=.c)
-
-
-##
-## Specify extra C Flags needed to build this subsystem
-##
-LOCAL_COPTS = 
-
-
-##
-## EXEDIR is defined here, just in case it needs to be different for a custom
-## build
-##
-EXEDIR=../exe
-
-##
-## Certain OSs and Application Loaders require the following option for
-## Shared libraries. Currently only needed for vxWorks 5.5 and RTEMS.
-## For each shared library that this app depends on, you need to have an
-## entry like the following:
-##  -R../tst_lib/tst_lib.elf
-##
-SHARED_LIB_LINK = 
-
-########################################################################
-# Should not have to change below this line, except for customized 
-# Mission and cFE directory structures
-########################################################################
-
-#
-# Set build type to CFE_APP. This allows us to 
-# define different compiler flags for the cFE Core and Apps.
-# 
-BUILD_TYPE = CFE_APP
-
-## 
-## Include all necessary cFE make rules
-## Any of these can be copied to a local file and 
-## changed if needed.
-##
-##
-##       cfe-config.mak contains PSP and OS selection
-##
-include ../cfe/cfe-config.mak
-##
-##       debug-opts.mak contains debug switches
-##
-include ../cfe/debug-opts.mak
-##
-##       compiler-opts.mak contains compiler definitions and switches/defines
-##
-include $(CFE_PSP_SRC)/$(PSP)/make/compiler-opts.mak
-
-##
-## Setup the include path for this subsystem
-## The OS specific includes are in the build-rules.make file
-##
-## If this subsystem needs include files from another app, add the path here.
-##
-INCLUDE_PATH = \
--I$(OSAL_SRC)/inc \
--I$(CFE_CORE_SRC)/inc \
--I$(CFE_PSP_SRC)/inc \
--I$(CFE_PSP_SRC)/$(PSP)/inc \
--I$(CFS_APP_SRC)/inc \
--I$(CFS_APP_SRC)/$(APPTARGET)/fsw/src \
--I$(CFS_MISSION_INC) \
--I../cfe/inc \
--I../inc
-
-##
-## Define the VPATH make variable. 
-## This can be modified to include source from another directory.
-## If there is no corresponding app in the cfs-apps directory, then this can be discarded, or
-## if the mission chooses to put the src in another directory such as "src", then that can be 
-## added here as well.
-##
-VPATH = $(CFS_APP_SRC)/$(APPTARGET)/fsw/src 
-
-##
-## Include the common make rules for building a cFE Application
-##
-include $(CFE_CORE_SRC)/make/app-rules.mak
diff --git a/fsw/src/sample_lib.c b/fsw/src/sample_lib.c
index 7f1596a..48b7aa4 100644
--- a/fsw/src/sample_lib.c
+++ b/fsw/src/sample_lib.c
@@ -18,8 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File:
-**   $Id: sample_lib.c $
+** File: sample_lib.c
 **
 ** Purpose: 
 **   Sample CFS library
diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h
index 6927167..2942583 100644
--- a/fsw/src/sample_lib_version.h
+++ b/fsw/src/sample_lib_version.h
@@ -18,8 +18,7 @@
 **      See the License for the specific language governing permissions and
 **      limitations under the License.
 **
-** File:
-**   $Id: sample_lib_version.h $
+** File: sample_lib_version.h
 **
 ** Purpose: 
 **  The SAMPLE Lib header file containing version number