diff --git a/nativeLib/build.native/makefile.cots b/nativeLib/build.native/makefile.cots
index 5a4627c093..3fc427c909 100644
--- a/nativeLib/build.native/makefile.cots
+++ b/nativeLib/build.native/makefile.cots
@@ -35,6 +35,7 @@ clean:
 	-$(MAKE) -C $(make_dir) uninstall
 	-$(MAKE) -C $(make_dir) $@
 	-@rm -f $(make_dir)/Makefile
+	-@rm -rf $(make_dir)
 	
 .PHONY: all
 
diff --git a/nativeLib/rary.cots.java/makefile b/nativeLib/rary.cots.java/makefile
index e6fd2b3469..2c889cf263 100644
--- a/nativeLib/rary.cots.java/makefile
+++ b/nativeLib/rary.cots.java/makefile
@@ -9,6 +9,8 @@ $(INSTALL_FROM):
 	find . -name "*.bin" -exec bash -c 'echo yes | ./{}' \;
 
 clean:
+	rm -rf jdk1.6.0_12
+	rm -rf uninstall~
 	rm -f $(BUILD_DIR)/lib/libjvm.so
 	chmod -R +w $(INSTALL_TO)
 	$(MAKE) -f ../build.native/makefile.copy clean
diff --git a/nativeLib/rary.cots.jna/makefile b/nativeLib/rary.cots.jna/makefile
index 77533f9918..0446e10375 100644
--- a/nativeLib/rary.cots.jna/makefile
+++ b/nativeLib/rary.cots.jna/makefile
@@ -1,4 +1,7 @@
 
 %:
 	find . -name "*.jar" -exec bash -c 'unzip -d $$(basename {} .jar) {} *.so' \;
-	$(MAKE) -f ../build.native/makefile.copy $@
\ No newline at end of file
+	$(MAKE) -f ../build.native/makefile.copy $@
+	
+clean:
+	rm -rf linux-i386
\ No newline at end of file
diff --git a/nativeLib/rary.empty.motif/.gitignore b/nativeLib/rary.empty.motif/.gitignore
new file mode 100644
index 0000000000..b037bec333
--- /dev/null
+++ b/nativeLib/rary.empty.motif/.gitignore
@@ -0,0 +1 @@
+/i386-pc-linux-gnu.debug
diff --git a/nativeLib/rary.empty/.gitignore b/nativeLib/rary.empty/.gitignore
new file mode 100644
index 0000000000..b037bec333
--- /dev/null
+++ b/nativeLib/rary.empty/.gitignore
@@ -0,0 +1 @@
+/i386-pc-linux-gnu.debug
diff --git a/nativeLib/rary.ohd.ffg/.gitignore b/nativeLib/rary.ohd.ffg/.gitignore
new file mode 100644
index 0000000000..b037bec333
--- /dev/null
+++ b/nativeLib/rary.ohd.ffg/.gitignore
@@ -0,0 +1 @@
+/i386-pc-linux-gnu.debug
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/.gitignore b/nativeLib/rary.wfoapi.MonitorTestMode/.gitignore
new file mode 100644
index 0000000000..98bbc3165b
--- /dev/null
+++ b/nativeLib/rary.wfoapi.MonitorTestMode/.gitignore
@@ -0,0 +1 @@
+/Debug
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/makefile b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/makefile
deleted file mode 100644
index 0f5ae10644..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.MonitorTestMode
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.MonitorTestMode: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++ -L../../build.native/i386-pc-linux-gnu/lib -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.MonitorTestMode" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.MonitorTestMode
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/objects.mk b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/objects.mk
deleted file mode 100644
index 393dd8103d..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrary.wfoapi.awips-common
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/rary.wfoapi.MonitorTestMode b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/rary.wfoapi.MonitorTestMode
deleted file mode 100755
index d428557120..0000000000
Binary files a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/rary.wfoapi.MonitorTestMode and /dev/null differ
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/sources.mk b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/MonitorTestMode.d b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/MonitorTestMode.d
deleted file mode 100644
index e568af1c71..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/MonitorTestMode.d
+++ /dev/null
@@ -1,49 +0,0 @@
-src/MonitorTestMode.d src/MonitorTestMode.o: ../src/MonitorTestMode.C \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.common/include/tmbUtil.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.common/include/tmbUtil.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/sockhelp.d b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/sockhelp.d
deleted file mode 100644
index 746ed3a11e..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/sockhelp.d
+++ /dev/null
@@ -1,46 +0,0 @@
-src/sockhelp.d src/sockhelp.o: ../src/sockhelp.C \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/subdir.mk
deleted file mode 100644
index 4ec1a5ef7e..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/subdir.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/MonitorTestMode.C \
-../src/sockhelp.C \
-../src/tmbUtil.C 
-
-OBJS += \
-./src/MonitorTestMode.o \
-./src/sockhelp.o \
-./src/tmbUtil.o 
-
-C_UPPER_DEPS += \
-./src/MonitorTestMode.d \
-./src/sockhelp.d \
-./src/tmbUtil.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.common/include -I../../rary.wfoapi.awips-common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/tmbUtil.d b/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/tmbUtil.d
deleted file mode 100644
index d10ca7c4e4..0000000000
--- a/nativeLib/rary.wfoapi.MonitorTestMode/Debug/src/tmbUtil.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/tmbUtil.d src/tmbUtil.o: ../src/tmbUtil.C \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.consoleUser/.gitignore b/nativeLib/rary.wfoapi.consoleUser/.gitignore
new file mode 100644
index 0000000000..98bbc3165b
--- /dev/null
+++ b/nativeLib/rary.wfoapi.consoleUser/.gitignore
@@ -0,0 +1 @@
+/Debug
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/makefile b/nativeLib/rary.wfoapi.consoleUser/Debug/makefile
deleted file mode 100644
index d3d745ed8e..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.consoleUser
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.consoleUser: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++  -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.consoleUser" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.consoleUser
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/objects.mk b/nativeLib/rary.wfoapi.consoleUser/Debug/objects.mk
deleted file mode 100644
index 224ef688d0..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS :=
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/rary.wfoapi.consoleUser b/nativeLib/rary.wfoapi.consoleUser/Debug/rary.wfoapi.consoleUser
deleted file mode 100755
index 29bee4a254..0000000000
Binary files a/nativeLib/rary.wfoapi.consoleUser/Debug/rary.wfoapi.consoleUser and /dev/null differ
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/sources.mk b/nativeLib/rary.wfoapi.consoleUser/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/src/Procstruct.d b/nativeLib/rary.wfoapi.consoleUser/Debug/src/Procstruct.d
deleted file mode 100644
index 6f653b9397..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/src/Procstruct.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/Procstruct.d src/Procstruct.o: ../src/Procstruct.C \
-  ../include/Procstruct.H
-
-../include/Procstruct.H:
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/src/consoleUser.d b/nativeLib/rary.wfoapi.consoleUser/Debug/src/consoleUser.d
deleted file mode 100644
index 4a826fd28a..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/src/consoleUser.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/consoleUser.d src/consoleUser.o: ../src/consoleUser.C \
-  ../include/getConsoleUser.H
-
-../include/getConsoleUser.H:
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/src/getConsoleUser.d b/nativeLib/rary.wfoapi.consoleUser/Debug/src/getConsoleUser.d
deleted file mode 100644
index d34d269b6d..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/src/getConsoleUser.d
+++ /dev/null
@@ -1,6 +0,0 @@
-src/getConsoleUser.d src/getConsoleUser.o: ../src/getConsoleUser.C \
-  ../include/Procstruct.H ../include/getConsoleUser.H
-
-../include/Procstruct.H:
-
-../include/getConsoleUser.H:
diff --git a/nativeLib/rary.wfoapi.consoleUser/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.consoleUser/Debug/src/subdir.mk
deleted file mode 100644
index 1ecf3a2294..0000000000
--- a/nativeLib/rary.wfoapi.consoleUser/Debug/src/subdir.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/Procstruct.C \
-../src/consoleUser.C \
-../src/getConsoleUser.C 
-
-OBJS += \
-./src/Procstruct.o \
-./src/consoleUser.o \
-./src/getConsoleUser.o 
-
-C_UPPER_DEPS += \
-./src/Procstruct.d \
-./src/consoleUser.d \
-./src/getConsoleUser.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/makefile b/nativeLib/rary.wfoapi.getTestMode/Debug/makefile
deleted file mode 100644
index 5227e0874c..0000000000
--- a/nativeLib/rary.wfoapi.getTestMode/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.getTestMode
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.getTestMode: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++ -L../../build.native/i386-pc-linux-gnu/lib -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.getTestMode" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.getTestMode
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/objects.mk b/nativeLib/rary.wfoapi.getTestMode/Debug/objects.mk
deleted file mode 100644
index 393dd8103d..0000000000
--- a/nativeLib/rary.wfoapi.getTestMode/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrary.wfoapi.awips-common
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/rary.wfoapi.getTestMode b/nativeLib/rary.wfoapi.getTestMode/Debug/rary.wfoapi.getTestMode
deleted file mode 100755
index 31e6cabbf2..0000000000
Binary files a/nativeLib/rary.wfoapi.getTestMode/Debug/rary.wfoapi.getTestMode and /dev/null differ
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/sources.mk b/nativeLib/rary.wfoapi.getTestMode/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.getTestMode/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/src/getTestMode.d b/nativeLib/rary.wfoapi.getTestMode/Debug/src/getTestMode.d
deleted file mode 100644
index fe974f524b..0000000000
--- a/nativeLib/rary.wfoapi.getTestMode/Debug/src/getTestMode.d
+++ /dev/null
@@ -1,43 +0,0 @@
-src/getTestMode.d src/getTestMode.o: ../src/getTestMode.C \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/src/sockhelp.d b/nativeLib/rary.wfoapi.getTestMode/Debug/src/sockhelp.d
deleted file mode 100644
index 746ed3a11e..0000000000
--- a/nativeLib/rary.wfoapi.getTestMode/Debug/src/sockhelp.d
+++ /dev/null
@@ -1,46 +0,0 @@
-src/sockhelp.d src/sockhelp.o: ../src/sockhelp.C \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.getTestMode/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.getTestMode/Debug/src/subdir.mk
deleted file mode 100644
index 99aa923778..0000000000
--- a/nativeLib/rary.wfoapi.getTestMode/Debug/src/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/getTestMode.C \
-../src/sockhelp.C 
-
-OBJS += \
-./src/getTestMode.o \
-./src/sockhelp.o 
-
-C_UPPER_DEPS += \
-./src/getTestMode.d \
-./src/sockhelp.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.common/include -I../../rary.wfoapi.awips-common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.showBanner/Debug/makefile b/nativeLib/rary.wfoapi.showBanner/Debug/makefile
deleted file mode 100644
index 99d5f89992..0000000000
--- a/nativeLib/rary.wfoapi.showBanner/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.showBanner
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.showBanner: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++  -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.showBanner" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.showBanner
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.showBanner/Debug/objects.mk b/nativeLib/rary.wfoapi.showBanner/Debug/objects.mk
deleted file mode 100644
index 3e39e6970e..0000000000
--- a/nativeLib/rary.wfoapi.showBanner/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lXm -lXt
diff --git a/nativeLib/rary.wfoapi.showBanner/Debug/sources.mk b/nativeLib/rary.wfoapi.showBanner/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.showBanner/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.showBanner/Debug/src/showBanner.d b/nativeLib/rary.wfoapi.showBanner/Debug/src/showBanner.d
deleted file mode 100644
index 64fd055eec..0000000000
--- a/nativeLib/rary.wfoapi.showBanner/Debug/src/showBanner.d
+++ /dev/null
@@ -1,148 +0,0 @@
-src/showBanner.d src/showBanner.o: ../src/showBanner.C \
-  ../../rary.empty.motif/include/Xm/Xm.h \
-  ../../rary.empty.motif/include/X11/Intrinsic.h \
-  ../../rary.empty.motif/include/X11/Xlib.h \
-  ../../rary.empty.motif/include/X11/X.h \
-  ../../rary.empty.motif/include/X11/Xfuncproto.h \
-  ../../rary.empty.motif/include/X11/Xosdefs.h \
-  ../../rary.empty.motif/include/X11/Xutil.h \
-  ../../rary.empty.motif/include/X11/keysym.h \
-  ../../rary.empty.motif/include/X11/keysymdef.h \
-  ../../rary.empty.motif/include/X11/Xresource.h \
-  ../../rary.empty.motif/include/X11/Core.h \
-  ../../rary.empty.motif/include/X11/Composite.h \
-  ../../rary.empty.motif/include/X11/Constraint.h \
-  ../../rary.empty.motif/include/X11/Object.h \
-  ../../rary.empty.motif/include/X11/RectObj.h \
-  ../../rary.empty.motif/include/X11/Shell.h \
-  ../../rary.empty.motif/include/X11/Xatom.h \
-  ../../rary.empty.motif/include/Xm/XmStrDefs.h \
-  ../../rary.empty.motif/include/X11/StringDefs.h \
-  ../../rary.empty.motif/include/Xm/VirtKeys.h \
-  ../../rary.empty.motif/include/Xm/Transfer.h \
-  ../../rary.empty.motif/include/Xm/DragDrop.h \
-  ../../rary.empty.motif/include/Xm/DragC.h \
-  ../../rary.empty.motif/include/Xm/Display.h \
-  ../../rary.empty.motif/include/Xm/DropSMgr.h \
-  ../../rary.empty.motif/include/Xm/DragIcon.h \
-  ../../rary.empty.motif/include/Xm/DropTrans.h \
-  ../../rary.empty.motif/include/Xm/DragOverS.h \
-  ../../rary.empty.motif/include/Xm/Primitive.h \
-  ../../rary.empty.motif/include/Xm/Manager.h \
-  ../../rary.empty.motif/include/Xm/Gadget.h \
-  ../../rary.empty.motif/include/Xm/VendorS.h \
-  ../../rary.empty.motif/include/Xm/XmIm.h \
-  ../../rary.empty.motif/include/Xm/Label.h \
-  ../../rary.wfoapi.common/include/tmbUtil.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H
-
-../../rary.empty.motif/include/Xm/Xm.h:
-
-../../rary.empty.motif/include/X11/Intrinsic.h:
-
-../../rary.empty.motif/include/X11/Xlib.h:
-
-../../rary.empty.motif/include/X11/X.h:
-
-../../rary.empty.motif/include/X11/Xfuncproto.h:
-
-../../rary.empty.motif/include/X11/Xosdefs.h:
-
-../../rary.empty.motif/include/X11/Xutil.h:
-
-../../rary.empty.motif/include/X11/keysym.h:
-
-../../rary.empty.motif/include/X11/keysymdef.h:
-
-../../rary.empty.motif/include/X11/Xresource.h:
-
-../../rary.empty.motif/include/X11/Core.h:
-
-../../rary.empty.motif/include/X11/Composite.h:
-
-../../rary.empty.motif/include/X11/Constraint.h:
-
-../../rary.empty.motif/include/X11/Object.h:
-
-../../rary.empty.motif/include/X11/RectObj.h:
-
-../../rary.empty.motif/include/X11/Shell.h:
-
-../../rary.empty.motif/include/X11/Xatom.h:
-
-../../rary.empty.motif/include/Xm/XmStrDefs.h:
-
-../../rary.empty.motif/include/X11/StringDefs.h:
-
-../../rary.empty.motif/include/Xm/VirtKeys.h:
-
-../../rary.empty.motif/include/Xm/Transfer.h:
-
-../../rary.empty.motif/include/Xm/DragDrop.h:
-
-../../rary.empty.motif/include/Xm/DragC.h:
-
-../../rary.empty.motif/include/Xm/Display.h:
-
-../../rary.empty.motif/include/Xm/DropSMgr.h:
-
-../../rary.empty.motif/include/Xm/DragIcon.h:
-
-../../rary.empty.motif/include/Xm/DropTrans.h:
-
-../../rary.empty.motif/include/Xm/DragOverS.h:
-
-../../rary.empty.motif/include/Xm/Primitive.h:
-
-../../rary.empty.motif/include/Xm/Manager.h:
-
-../../rary.empty.motif/include/Xm/Gadget.h:
-
-../../rary.empty.motif/include/Xm/VendorS.h:
-
-../../rary.empty.motif/include/Xm/XmIm.h:
-
-../../rary.empty.motif/include/Xm/Label.h:
-
-../../rary.wfoapi.common/include/tmbUtil.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
diff --git a/nativeLib/rary.wfoapi.showBanner/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.showBanner/Debug/src/subdir.mk
deleted file mode 100644
index bdaa6741cc..0000000000
--- a/nativeLib/rary.wfoapi.showBanner/Debug/src/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/showBanner.C \
-../src/tmbUtil.C 
-
-OBJS += \
-./src/showBanner.o \
-./src/tmbUtil.o 
-
-C_UPPER_DEPS += \
-./src/showBanner.d \
-./src/tmbUtil.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.common/include -I../../rary.empty.motif/include -I../../rary.wfoapi.awips-common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.showBanner/Debug/src/tmbUtil.d b/nativeLib/rary.wfoapi.showBanner/Debug/src/tmbUtil.d
deleted file mode 100644
index d10ca7c4e4..0000000000
--- a/nativeLib/rary.wfoapi.showBanner/Debug/src/tmbUtil.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/tmbUtil.d src/tmbUtil.o: ../src/tmbUtil.C \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/makefile b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/makefile
deleted file mode 100644
index c43e967857..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.test_WorkstationTestMode
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.test_WorkstationTestMode: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++ -L../../build.native/i386-pc-linux-gnu/lib -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.test_WorkstationTestMode" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.test_WorkstationTestMode
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/objects.mk b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/objects.mk
deleted file mode 100644
index 393dd8103d..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrary.wfoapi.awips-common
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/sources.mk b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/WorkstationTestMode.d b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/WorkstationTestMode.d
deleted file mode 100644
index 473d14b94d..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/WorkstationTestMode.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/WorkstationTestMode.d src/WorkstationTestMode.o:  \
- ../src/WorkstationTestMode.C ../include/WorkstationTestMode.H
-
-../include/WorkstationTestMode.H:
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/sockhelp.d b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/sockhelp.d
deleted file mode 100644
index 746ed3a11e..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/sockhelp.d
+++ /dev/null
@@ -1,46 +0,0 @@
-src/sockhelp.d src/sockhelp.o: ../src/sockhelp.C \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/subdir.mk
deleted file mode 100644
index 0bf3855c75..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/subdir.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/WorkstationTestMode.C \
-../src/sockhelp.C \
-../src/test_WorkstationTestMode.C 
-
-OBJS += \
-./src/WorkstationTestMode.o \
-./src/sockhelp.o \
-./src/test_WorkstationTestMode.o 
-
-C_UPPER_DEPS += \
-./src/WorkstationTestMode.d \
-./src/sockhelp.d \
-./src/test_WorkstationTestMode.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../include -I../../rary.wfoapi.awips-common/include -I../../rary.wfoapi.common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/test_WorkstationTestMode.d b/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/test_WorkstationTestMode.d
deleted file mode 100644
index 37a4543a6d..0000000000
--- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/Debug/src/test_WorkstationTestMode.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/test_WorkstationTestMode.d src/test_WorkstationTestMode.o:  \
- ../src/test_WorkstationTestMode.C ../include/WorkstationTestMode.H
-
-../include/WorkstationTestMode.H:
diff --git a/nativeLib/rary.wfoapi.tmb/.gitignore b/nativeLib/rary.wfoapi.tmb/.gitignore
new file mode 100644
index 0000000000..98bbc3165b
--- /dev/null
+++ b/nativeLib/rary.wfoapi.tmb/.gitignore
@@ -0,0 +1 @@
+/Debug
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/makefile b/nativeLib/rary.wfoapi.tmb/Debug/makefile
deleted file mode 100644
index 60e8ae667d..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++ -L../../build.native/i386-pc-linux-gnu/lib -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/objects.mk b/nativeLib/rary.wfoapi.tmb/Debug/objects.mk
deleted file mode 100644
index 393dd8103d..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrary.wfoapi.awips-common
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/sources.mk b/nativeLib/rary.wfoapi.tmb/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/src/sockhelp.d b/nativeLib/rary.wfoapi.tmb/Debug/src/sockhelp.d
deleted file mode 100644
index 746ed3a11e..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/src/sockhelp.d
+++ /dev/null
@@ -1,46 +0,0 @@
-src/sockhelp.d src/sockhelp.o: ../src/sockhelp.C \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.tmb/Debug/src/subdir.mk
deleted file mode 100644
index bb5489a4a1..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/src/subdir.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/sockhelp.C \
-../src/tmb.C \
-../src/tmbUtil.C 
-
-OBJS += \
-./src/sockhelp.o \
-./src/tmb.o \
-./src/tmbUtil.o 
-
-C_UPPER_DEPS += \
-./src/sockhelp.d \
-./src/tmb.d \
-./src/tmbUtil.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.awips-common/include -I../../rary.wfoapi.common/include -I../include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/src/tmb.d b/nativeLib/rary.wfoapi.tmb/Debug/src/tmb.d
deleted file mode 100644
index c8f082aa81..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/src/tmb.d
+++ /dev/null
@@ -1,10 +0,0 @@
-src/tmb.d src/tmb.o: ../src/tmb.C \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.tmb/Debug/src/tmbUtil.d b/nativeLib/rary.wfoapi.tmb/Debug/src/tmbUtil.d
deleted file mode 100644
index d10ca7c4e4..0000000000
--- a/nativeLib/rary.wfoapi.tmb/Debug/src/tmbUtil.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/tmbUtil.d src/tmbUtil.o: ../src/tmbUtil.C \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/.gitignore b/nativeLib/rary.wfoapi.tmbRemoteCheck/.gitignore
new file mode 100644
index 0000000000..98bbc3165b
--- /dev/null
+++ b/nativeLib/rary.wfoapi.tmbRemoteCheck/.gitignore
@@ -0,0 +1 @@
+/Debug
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/makefile b/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/makefile
deleted file mode 100644
index 4f15b3936d..0000000000
--- a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmbRemoteCheck
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmbRemoteCheck: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++  -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmbRemoteCheck" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmbRemoteCheck
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/objects.mk b/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/objects.mk
deleted file mode 100644
index 224ef688d0..0000000000
--- a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS :=
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/sources.mk b/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/subdir.mk
deleted file mode 100644
index 8dbd0249b7..0000000000
--- a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/tmbRemoteCheck.C \
-../src/tmbUtil.C 
-
-OBJS += \
-./src/tmbRemoteCheck.o \
-./src/tmbUtil.o 
-
-C_UPPER_DEPS += \
-./src/tmbRemoteCheck.d \
-./src/tmbUtil.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/tmbRemoteCheck.d b/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/tmbRemoteCheck.d
deleted file mode 100644
index 6ed4b7deab..0000000000
--- a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/tmbRemoteCheck.d
+++ /dev/null
@@ -1,10 +0,0 @@
-src/tmbRemoteCheck.d src/tmbRemoteCheck.o: ../src/tmbRemoteCheck.C \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/tmbUtil.d b/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/tmbUtil.d
deleted file mode 100644
index d10ca7c4e4..0000000000
--- a/nativeLib/rary.wfoapi.tmbRemoteCheck/Debug/src/tmbUtil.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/tmbUtil.d src/tmbUtil.o: ../src/tmbUtil.C \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.tmb_exit/Debug/makefile b/nativeLib/rary.wfoapi.tmb_exit/Debug/makefile
deleted file mode 100644
index 275dd3377a..0000000000
--- a/nativeLib/rary.wfoapi.tmb_exit/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb_exit
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb_exit: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++ -L../../build.native/i386-pc-linux-gnu/lib -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb_exit" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmb_exit
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.tmb_exit/Debug/objects.mk b/nativeLib/rary.wfoapi.tmb_exit/Debug/objects.mk
deleted file mode 100644
index 393dd8103d..0000000000
--- a/nativeLib/rary.wfoapi.tmb_exit/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrary.wfoapi.awips-common
diff --git a/nativeLib/rary.wfoapi.tmb_exit/Debug/sources.mk b/nativeLib/rary.wfoapi.tmb_exit/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.tmb_exit/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.tmb_exit/Debug/src/sockhelp.d b/nativeLib/rary.wfoapi.tmb_exit/Debug/src/sockhelp.d
deleted file mode 100644
index 746ed3a11e..0000000000
--- a/nativeLib/rary.wfoapi.tmb_exit/Debug/src/sockhelp.d
+++ /dev/null
@@ -1,46 +0,0 @@
-src/sockhelp.d src/sockhelp.o: ../src/sockhelp.C \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.tmb_exit/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.tmb_exit/Debug/src/subdir.mk
deleted file mode 100644
index 5a3c090456..0000000000
--- a/nativeLib/rary.wfoapi.tmb_exit/Debug/src/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/sockhelp.C \
-../src/tmb_exit.C 
-
-OBJS += \
-./src/sockhelp.o \
-./src/tmb_exit.o 
-
-C_UPPER_DEPS += \
-./src/sockhelp.d \
-./src/tmb_exit.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.common/include -I../../rary.wfoapi.awips-common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.tmb_exit/Debug/src/tmb_exit.d b/nativeLib/rary.wfoapi.tmb_exit/Debug/src/tmb_exit.d
deleted file mode 100644
index 95ba548bab..0000000000
--- a/nativeLib/rary.wfoapi.tmb_exit/Debug/src/tmb_exit.d
+++ /dev/null
@@ -1,7 +0,0 @@
-src/tmb_exit.d src/tmb_exit.o: ../src/tmb_exit.C \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
diff --git a/nativeLib/rary.wfoapi.tmcp/.gitignore b/nativeLib/rary.wfoapi.tmcp/.gitignore
new file mode 100644
index 0000000000..98bbc3165b
--- /dev/null
+++ b/nativeLib/rary.wfoapi.tmcp/.gitignore
@@ -0,0 +1 @@
+/Debug
diff --git a/nativeLib/rary.wfoapi.tmcp/Debug/makefile b/nativeLib/rary.wfoapi.tmcp/Debug/makefile
deleted file mode 100644
index f3924c5ec9..0000000000
--- a/nativeLib/rary.wfoapi.tmcp/Debug/makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include src/subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmcp
-
-# Tool invocations
-../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmcp: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	../../build.native/tools/link.sh g++ -L../../build.native/i386-pc-linux-gnu/lib -o"../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmcp" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) ../../build.native/i386-pc-linux-gnu/bin/rary.wfoapi.tmcp
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/nativeLib/rary.wfoapi.tmcp/Debug/objects.mk b/nativeLib/rary.wfoapi.tmcp/Debug/objects.mk
deleted file mode 100644
index 2b23c0b807..0000000000
--- a/nativeLib/rary.wfoapi.tmcp/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS := -lrary.wfoapi.awips-common -lXm -lXt
diff --git a/nativeLib/rary.wfoapi.tmcp/Debug/sources.mk b/nativeLib/rary.wfoapi.tmcp/Debug/sources.mk
deleted file mode 100644
index 8f65bbe124..0000000000
--- a/nativeLib/rary.wfoapi.tmcp/Debug/sources.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-src \
-
diff --git a/nativeLib/rary.wfoapi.tmcp/Debug/src/subdir.mk b/nativeLib/rary.wfoapi.tmcp/Debug/src/subdir.mk
deleted file mode 100644
index cb281bc667..0000000000
--- a/nativeLib/rary.wfoapi.tmcp/Debug/src/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-C_UPPER_SRCS += \
-../src/tmbUtil.C \
-../src/tmcp.C 
-
-OBJS += \
-./src/tmbUtil.o \
-./src/tmcp.o 
-
-C_UPPER_DEPS += \
-./src/tmbUtil.d \
-./src/tmcp.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-src/%.o: ../src/%.C
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	../../build.native/tools/compile.sh -I../../rary.wfoapi.common/include -I../../rary.empty.motif/include -I../include -I../../rary.wfoapi.awips-common/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/nativeLib/rary.wfoapi.tmcp/Debug/src/tmbUtil.d b/nativeLib/rary.wfoapi.tmcp/Debug/src/tmbUtil.d
deleted file mode 100644
index d10ca7c4e4..0000000000
--- a/nativeLib/rary.wfoapi.tmcp/Debug/src/tmbUtil.d
+++ /dev/null
@@ -1,4 +0,0 @@
-src/tmbUtil.d src/tmbUtil.o: ../src/tmbUtil.C \
-  ../../rary.wfoapi.common/include/tmbUtil.H
-
-../../rary.wfoapi.common/include/tmbUtil.H:
diff --git a/nativeLib/rary.wfoapi.tmcp/Debug/src/tmcp.d b/nativeLib/rary.wfoapi.tmcp/Debug/src/tmcp.d
deleted file mode 100644
index ea0ea49cec..0000000000
--- a/nativeLib/rary.wfoapi.tmcp/Debug/src/tmcp.d
+++ /dev/null
@@ -1,171 +0,0 @@
-src/tmcp.d src/tmcp.o: ../src/tmcp.C \
-  ../../rary.empty.motif/include/Xm/Text.h \
-  ../../rary.empty.motif/include/Xm/Xm.h \
-  ../../rary.empty.motif/include/X11/Intrinsic.h \
-  ../../rary.empty.motif/include/X11/Xlib.h \
-  ../../rary.empty.motif/include/X11/X.h \
-  ../../rary.empty.motif/include/X11/Xfuncproto.h \
-  ../../rary.empty.motif/include/X11/Xosdefs.h \
-  ../../rary.empty.motif/include/X11/Xutil.h \
-  ../../rary.empty.motif/include/X11/keysym.h \
-  ../../rary.empty.motif/include/X11/keysymdef.h \
-  ../../rary.empty.motif/include/X11/Xresource.h \
-  ../../rary.empty.motif/include/X11/Core.h \
-  ../../rary.empty.motif/include/X11/Composite.h \
-  ../../rary.empty.motif/include/X11/Constraint.h \
-  ../../rary.empty.motif/include/X11/Object.h \
-  ../../rary.empty.motif/include/X11/RectObj.h \
-  ../../rary.empty.motif/include/X11/Shell.h \
-  ../../rary.empty.motif/include/X11/Xatom.h \
-  ../../rary.empty.motif/include/Xm/XmStrDefs.h \
-  ../../rary.empty.motif/include/X11/StringDefs.h \
-  ../../rary.empty.motif/include/Xm/VirtKeys.h \
-  ../../rary.empty.motif/include/Xm/Transfer.h \
-  ../../rary.empty.motif/include/Xm/DragDrop.h \
-  ../../rary.empty.motif/include/Xm/DragC.h \
-  ../../rary.empty.motif/include/Xm/Display.h \
-  ../../rary.empty.motif/include/Xm/DropSMgr.h \
-  ../../rary.empty.motif/include/Xm/DragIcon.h \
-  ../../rary.empty.motif/include/Xm/DropTrans.h \
-  ../../rary.empty.motif/include/Xm/DragOverS.h \
-  ../../rary.empty.motif/include/Xm/Primitive.h \
-  ../../rary.empty.motif/include/Xm/Manager.h \
-  ../../rary.empty.motif/include/Xm/Gadget.h \
-  ../../rary.empty.motif/include/Xm/VendorS.h \
-  ../../rary.empty.motif/include/Xm/XmIm.h \
-  ../../rary.empty.motif/include/Xm/Label.h \
-  ../../rary.empty.motif/include/Xm/MainW.h \
-  ../../rary.empty.motif/include/Xm/PushB.h \
-  ../../rary.empty.motif/include/Xm/RowColumn.h \
-  ../../rary.empty.motif/include/Xm/Form.h \
-  ../../rary.empty.motif/include/Xm/BulletinB.h \
-  ../../rary.wfoapi.common/include/testmode.H \
-  ../../rary.wfoapi.common/include/sockhelp.H \
-  ../../rary.wfoapi.common/include/tmbUtil.H ../include/hourglass.H \
-  ../include/hourglassM.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H \
-  ../../rary.wfoapi.awips-common/include/LogFilter.H \
-  ../../rary.wfoapi.awips-common/include/LogSink.H \
-  ../../rary.wfoapi.awips-common/include/LogMsgCategory.H \
-  ../../rary.wfoapi.awips-common/include/TextString.H \
-  ../../rary.wfoapi.awips-common/include/RCObject.H \
-  ../../rary.wfoapi.awips-common/include/commonDefs.h \
-  ../../rary.wfoapi.awips-common/include/RCPtr.H \
-  ../../rary.wfoapi.awips-common/include/utilityFuncs.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefix.H \
-  ../../rary.wfoapi.awips-common/include/LogPrefParser.H \
-  ../../rary.wfoapi.awips-common/include/LogStream.H
-
-../../rary.empty.motif/include/Xm/Text.h:
-
-../../rary.empty.motif/include/Xm/Xm.h:
-
-../../rary.empty.motif/include/X11/Intrinsic.h:
-
-../../rary.empty.motif/include/X11/Xlib.h:
-
-../../rary.empty.motif/include/X11/X.h:
-
-../../rary.empty.motif/include/X11/Xfuncproto.h:
-
-../../rary.empty.motif/include/X11/Xosdefs.h:
-
-../../rary.empty.motif/include/X11/Xutil.h:
-
-../../rary.empty.motif/include/X11/keysym.h:
-
-../../rary.empty.motif/include/X11/keysymdef.h:
-
-../../rary.empty.motif/include/X11/Xresource.h:
-
-../../rary.empty.motif/include/X11/Core.h:
-
-../../rary.empty.motif/include/X11/Composite.h:
-
-../../rary.empty.motif/include/X11/Constraint.h:
-
-../../rary.empty.motif/include/X11/Object.h:
-
-../../rary.empty.motif/include/X11/RectObj.h:
-
-../../rary.empty.motif/include/X11/Shell.h:
-
-../../rary.empty.motif/include/X11/Xatom.h:
-
-../../rary.empty.motif/include/Xm/XmStrDefs.h:
-
-../../rary.empty.motif/include/X11/StringDefs.h:
-
-../../rary.empty.motif/include/Xm/VirtKeys.h:
-
-../../rary.empty.motif/include/Xm/Transfer.h:
-
-../../rary.empty.motif/include/Xm/DragDrop.h:
-
-../../rary.empty.motif/include/Xm/DragC.h:
-
-../../rary.empty.motif/include/Xm/Display.h:
-
-../../rary.empty.motif/include/Xm/DropSMgr.h:
-
-../../rary.empty.motif/include/Xm/DragIcon.h:
-
-../../rary.empty.motif/include/Xm/DropTrans.h:
-
-../../rary.empty.motif/include/Xm/DragOverS.h:
-
-../../rary.empty.motif/include/Xm/Primitive.h:
-
-../../rary.empty.motif/include/Xm/Manager.h:
-
-../../rary.empty.motif/include/Xm/Gadget.h:
-
-../../rary.empty.motif/include/Xm/VendorS.h:
-
-../../rary.empty.motif/include/Xm/XmIm.h:
-
-../../rary.empty.motif/include/Xm/Label.h:
-
-../../rary.empty.motif/include/Xm/MainW.h:
-
-../../rary.empty.motif/include/Xm/PushB.h:
-
-../../rary.empty.motif/include/Xm/RowColumn.h:
-
-../../rary.empty.motif/include/Xm/Form.h:
-
-../../rary.empty.motif/include/Xm/BulletinB.h:
-
-../../rary.wfoapi.common/include/testmode.H:
-
-../../rary.wfoapi.common/include/sockhelp.H:
-
-../../rary.wfoapi.common/include/tmbUtil.H:
-
-../include/hourglass.H:
-
-../include/hourglassM.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H:
-
-../../rary.wfoapi.awips-common/include/LogFilter.H:
-
-../../rary.wfoapi.awips-common/include/LogSink.H:
-
-../../rary.wfoapi.awips-common/include/LogMsgCategory.H:
-
-../../rary.wfoapi.awips-common/include/TextString.H:
-
-../../rary.wfoapi.awips-common/include/RCObject.H:
-
-../../rary.wfoapi.awips-common/include/commonDefs.h:
-
-../../rary.wfoapi.awips-common/include/RCPtr.H:
-
-../../rary.wfoapi.awips-common/include/utilityFuncs.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefix.H:
-
-../../rary.wfoapi.awips-common/include/LogPrefParser.H:
-
-../../rary.wfoapi.awips-common/include/LogStream.H: