diff --git a/uc/Makefile b/uc/Makefile
index abe2f2a..de9eff1 100755
--- a/uc/Makefile
+++ b/uc/Makefile
@@ -173,7 +173,7 @@ all: bin_files build sizeafter
 
 build: elf hex eep
 
-bin_files: $(TARGET).pde
+bin_files: $(TARGET).c
 	# Here is the "preprocessing".
 	# It creates a .cpp file based with the same name as the .pde file.
 	# On top of the new .cpp file comes the WProgram.h header.
@@ -183,7 +183,7 @@ bin_files: $(TARGET).pde
 	# Not the original .pde file you actually edit...
 	test -d bin || mkdir bin
 	#echo '#include "WProgram.h"' > bin/$(TARGET).cpp
-	cat $(TARGET).pde > bin/$(TARGET).c
+	cp $(TARGET).c  bin/$(TARGET).c
 	#cat main.cxx >> bin/$(TARGET).cpp
 
 elf: bin/$(TARGET).elf
@@ -241,7 +241,7 @@ extcoff: $(TARGET).elf
 	$(NM) -n $< > $@
 
 	# Link: create ELF output file from library.
-bin/$(TARGET).elf: $(TARGET).pde bin/core.a 
+bin/$(TARGET).elf: $(TARGET).c bin/core.a 
 	$(CC) $(ALL_CFLAGS) -o $@ bin/$(TARGET).c -L. bin/core.a $(LDFLAGS)
 
 bin/core.a: $(OBJ)
diff --git a/uc/main.1mhz.c b/uc/main.c
similarity index 99%
rename from uc/main.1mhz.c
rename to uc/main.c
index c9e9c22..f6198c5 100644
--- a/uc/main.1mhz.c
+++ b/uc/main.c
@@ -23,7 +23,7 @@
 
 #include "wiring/wiring_private.h"
 
-#include "main.1mhz.h"
+#include "main.h"
 
 #include <avr/io.h>
 // pin/register/ISR definitions
diff --git a/uc/main.cxx b/uc/main.cxx
deleted file mode 100755
index 3d9ecc6..0000000
--- a/uc/main.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-int main(void)
-{
-	WDT_off();
-
-//	init();
-
-	setup();
-    
-	for (;;)
-		loop();
-        
-	return 0;
-}
-
diff --git a/uc/main.1mhz.h b/uc/main.h
similarity index 100%
rename from uc/main.1mhz.h
rename to uc/main.h
diff --git a/uc/main.pde b/uc/main.pde
deleted file mode 120000
index 7166514..0000000
--- a/uc/main.pde
+++ /dev/null
@@ -1 +0,0 @@
-main.1mhz.c
\ No newline at end of file