diff --git a/uppsrc/Skylark/StdLib.icpp b/uppsrc/Skylark/StdLib.icpp
index 1b1cf8983..95b54f8a5 100644
--- a/uppsrc/Skylark/StdLib.icpp
+++ b/uppsrc/Skylark/StdLib.icpp
@@ -86,10 +86,10 @@ INITBLOCK {
 	Compiler::Register("cycle", Cycle);
 	Compiler::Register("raw", RawFn);
 	Compiler::Register("count", CountFn);
-	Compiler::Register("post_identity", PostIdentity);
-	Compiler::Register("js_identity", JsIdentity);
-	Compiler::Register("set", VariablesSet);
-    Compiler::Register("render", Render);
-};
-
-};
+	Compiler::Register("post_identity", PostIdentity);
+	Compiler::Register("js_identity", JsIdentity);
+	Compiler::Register("set", VariablesSet);
+	Compiler::Register("render", Render);
+};
+
+};
diff --git a/uppsrc/XmlView/XmlView.iml.$tmp b/uppsrc/XmlView/XmlView.iml.$tmp
deleted file mode 100644
index 67345ba58..000000000
--- a/uppsrc/XmlView/XmlView.iml.$tmp
+++ /dev/null
@@ -1,21 +0,0 @@
-PREMULTIPLIED
-IMAGE_ID(Tag)
-IMAGE_ID(Text)
-IMAGE_ID(PI)
-IMAGE_ID(Decl)
-IMAGE_ID(Comment)
-IMAGE_ID(Icon)
-
-IMAGE_BEGIN_DATA
-IMAGE_DATA(120,156,237,152,129,17,131,32,12,69,211,13,218,225,156,167,157,199,41,28,194,125,168,208,234,33,36,36,64,84,106,253)
-IMAGE_DATA(119,57,109,241,63,163,9,180,7,60,224,14,0,55,248,3,117,83,24,34,58,137,127,146,25,199,209,132,178,223,217,49)
-IMAGE_DATA(134,227,252,125,223,71,254,89,118,44,193,137,252,0,207,41,94,75,48,28,244,254,190,79,144,15,154,191,159,7,197,249)
-IMAGE_DATA(190,103,173,60,52,222,135,86,93,180,250,99,225,64,93,159,30,39,187,152,24,195,95,247,131,162,10,34,13,199,40,213)
-IMAGE_DATA(86,140,112,178,96,199,245,56,158,135,63,217,66,70,124,206,51,184,207,123,229,81,202,200,145,54,67,161,79,219,208,137)
-IMAGE_DATA(255,153,104,20,196,216,118,17,133,6,39,151,49,47,28,26,185,132,156,146,92,90,120,47,84,30,71,213,168,148,115,45)
-IMAGE_DATA(38,205,171,182,72,210,86,169,102,72,253,159,95,221,109,24,57,207,160,193,208,240,99,121,236,157,67,46,35,35,218,214)
-IMAGE_DATA(181,152,136,139,228,174,29,134,1,13,1,139,244,18,44,145,223,78,30,236,28,225,36,238,71,51,2,78,145,159,99,72)
-IMAGE_DATA(252,220,243,100,230,160,89,23,173,254,136,88,72,180,173,251,121,247,76,172,74,87,122,55,206,137,224,176,62,130,179,242)
-IMAGE_DATA(166,246,68,252,99,152,75,202,143,237,181,80,254,240,26,141,251,107,251,37,123,67,18,97,53,172,168,191,70,255,29,162)
-IMAGE_DATA(55,201,15,122,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
-IMAGE_END_DATA(352, 6)
diff --git a/uppsrc/ide/LayDes/LayDes.upp b/uppsrc/ide/LayDes/LayDes.upp
index 696003d2d..8d3bd31d5 100644
--- a/uppsrc/ide/LayDes/LayDes.upp
+++ b/uppsrc/ide/LayDes/LayDes.upp
@@ -24,7 +24,7 @@ file
 	layfile.cpp,
 	laywin.cpp,
 	LayDes.lay,
-	Info readonly separator,
 	LayDes.iml,
+	Info readonly separator,
 	Copying;
 
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 2027954de..cb2aa2268 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -13,7 +13,7 @@
 #include <ide/Java/Java.h>
 #include <ide/LayDes/LayDes.h>
 #include <ide/Debuggers/Debuggers.h>
-#include <TextDiffCtrl/TextDiffCtrl.h>   
+#include <TextDiffCtrl/TextDiffCtrl.h>
 #include <ide/Designers/Designers.h>
 #include <ide/Android/Android.h>
 
diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key
index 560614b4a..d71bdd90b 100644
--- a/uppsrc/ide/ide.key
+++ b/uppsrc/ide/ide.key
@@ -91,7 +91,8 @@ KEY(CALC, "Calculator", K_CTRL_E)
 KEY(QTF, "QTF designer", K_ALT_Q)
 KEY(XML, "XML view", K_ALT_X)
 KEY(JSON, "JSON view", K_ALT_N)
-KEY(ASSIST, "Assist", ' '|K_CTRL)KEY(ABBR, "Complete abbreviation", K_CTRL_PERIOD)
+KEY(ASSIST, "Assist", ' '|K_CTRL)
+KEY(ABBR, "Complete abbreviation", K_CTRL_PERIOD)
 KEY(DCOPY, "Copy as definition/declaration", K_ALT_C)
 KEY(VIRTUALS, "Virtual methods..", K_ALT_V)
 KEY(THISBACKS, "THISBACKs..", K_ALT_T)
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 59f88847f..ba9333204 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -121,7 +121,7 @@ void Ide::EditSpecial(Bar& menu)
 	menu.Add(AK_COPYWORD, THISBACK(CopyWord))
 	    .Help("Copy the current identifier to the clipboard");
 	menu.Add(AK_DUPLICATELINE, THISBACK(DuplicateLine))
-	    .Help("Duplice the current line");
+	    .Help("Duplicate the current line");
 	menu.Add(AK_FORMATCODE, THISBACK(FormatCode))
 	    .Help("Reformat code in editor");
 	menu.Add(editor.IsSelection(), AK_TOUPPER, THISBACK(TextToUpper))
diff --git a/uppsrc/plugin/z/build_info.h b/uppsrc/plugin/z/build_info.h
deleted file mode 100644
index f808b2ef9..000000000
--- a/uppsrc/plugin/z/build_info.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#define bmYEAR   2015
-#define bmMONTH  5
-#define bmDAY    3
-#define bmHOUR   8
-#define bmMINUTE 58
-#define bmSECOND 32
-#define bmTIME   Time(2015, 5, 3, 8, 58, 32)
-#define bmMACHINE "CXL-PC"
-#define bmUSER    "CXL"