diff --git a/frontend/js/fpMap.js b/frontend/js/fpMap.js
index 7b9f8fb0..d9bacd46 100644
--- a/frontend/js/fpMap.js
+++ b/frontend/js/fpMap.js
@@ -9,7 +9,7 @@
 		};
 	} ]);
 
-	fp.app.factory("fpMap", [ "fpUtils", "fpSocket", "fpMapMessages", "fpDialogs", "fpMapMarkers", "fpMapPopups", "$templateCache", "$compile", "fpMapLines", "fpMapTypes", "fpMapViews", "$rootScope", "fpMapPad", "fpMapToolbox", "$timeout", "fpMapLegend", "fpMapSearch", function(fpUtils, fpSocket, fpMapMessages, fpDialogs, fpMapMarkers, fpMapPopups, $templateCache, $compile, fpMapLines, fpMapTypes, fpMapViews, $rootScope, fpMapPad, fpMapToolbox, $timeout, fpMapLegend, fpMapSearch) {
+	fp.app.factory("fpMap", function(fpUtils, fpSocket, fpMapMessages, fpDialogs, fpMapMarkers, fpMapPopups, $templateCache, $compile, fpMapLines, fpMapTypes, fpMapViews, $rootScope, fpMapPad, fpMapToolbox, $timeout, fpMapLegend, fpMapSearch) {
 		var maps = { };
 
 		var ret = { };
@@ -443,6 +443,6 @@
 				map.socket.updateBbox(bbox);
 			});
 		}
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular, FacilMap, OpenLayers);
\ No newline at end of file
diff --git a/frontend/js/fpMapPopups.js b/frontend/js/fpMapPopups.js
index 2bf83347..8e8f7391 100644
--- a/frontend/js/fpMapPopups.js
+++ b/frontend/js/fpMapPopups.js
@@ -1,6 +1,6 @@
 (function(fp, $, ng, undefined) {
 
-	fp.app.factory("fpMapPopups", [ "$compile", "$parse", "$templateCache", "fpUi", "$timeout", function($compile, $parse, $templateCache, fpUi, $timeout) {
+	fp.app.factory("fpMapPopups", function($compile, $parse, $templateCache, fpUi, $timeout) {
 		return function(map) {
 			var openPopups = [ ];
 
@@ -77,6 +77,6 @@
 				}
 			};
 		};
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpMapSearch.js b/frontend/js/fpMapSearch.js
index 0d390847..e1a8062f 100644
--- a/frontend/js/fpMapSearch.js
+++ b/frontend/js/fpMapSearch.js
@@ -1,6 +1,6 @@
 (function(fp, $, ng, undefined) {
 
-	fp.app.factory("fpMapSearch", [ "$rootScope", "$templateCache", "$compile", "fpUtils", function($rootScope, $templateCache, $compile, fpUtils) {
+	fp.app.factory("fpMapSearch", function($rootScope, $templateCache, $compile, fpUtils) {
 		var namefinder = new FacilMap.NameFinder.Nominatim();
 
 		return function(map) {
@@ -30,6 +30,6 @@
 			$compile(el)(scope);
 			scope.$evalAsync(); // $compile only replaces variables on next digest
 		};
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpMapToolbox.js b/frontend/js/fpMapToolbox.js
index 874c62a9..44e1dde1 100644
--- a/frontend/js/fpMapToolbox.js
+++ b/frontend/js/fpMapToolbox.js
@@ -14,7 +14,7 @@
 		}
 	});
 
-	fp.app.factory("fpMapToolbox", [ "$compile", "$templateCache", "fpTable", function($compile, $templateCache, fpTable) {
+	fp.app.factory("fpMapToolbox", function($compile, $templateCache, fpTable) {
 		return function(map) {
 			var scope = map.socket.$new();
 
@@ -47,6 +47,6 @@
 			$compile($($templateCache.get("map-toolbox.html")).appendTo(map.map.div))(scope);
 			scope.$evalAsync(); // $compile only replaces variables on next digest
 		}
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpMapTypes.js b/frontend/js/fpMapTypes.js
index 776b2d81..ce942fe0 100644
--- a/frontend/js/fpMapTypes.js
+++ b/frontend/js/fpMapTypes.js
@@ -1,6 +1,6 @@
 (function(fp, $, ng, undefined) {
 
-	fp.app.factory("fpMapTypes", [ "fpDialogs", "fpUtils", function(fpDialogs, fpUtils) {
+	fp.app.factory("fpMapTypes", function(fpDialogs, fpUtils) {
 		return function(map) {
 			var ret = {
 				editTypes : function() {
@@ -101,6 +101,6 @@
 			};
 			return ret;
 		};
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpMapViews.js b/frontend/js/fpMapViews.js
index 3b7d189b..39ec4157 100644
--- a/frontend/js/fpMapViews.js
+++ b/frontend/js/fpMapViews.js
@@ -1,6 +1,6 @@
 (function(fp, $, ng, undefined) {
 
-	fp.app.factory("fpMapViews", [ "fpDialogs", function(fpDialogs) {
+	fp.app.factory("fpMapViews", function(fpDialogs) {
 		return function(map) {
 			var ret = {
 				saveView : function() {
@@ -56,6 +56,6 @@
 
 			return ret;
 		};
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpSocket.js b/frontend/js/fpSocket.js
index 8d593f1f..1750e826 100644
--- a/frontend/js/fpSocket.js
+++ b/frontend/js/fpSocket.js
@@ -1,7 +1,7 @@
 (function(fp, $, ng, undefined) {
 
 	// From http://stackoverflow.com/a/11277751/242365
-	fp.app.factory("fpSocket", [ "$rootScope", "fpUtils", function($rootScope, fpUtils) {
+	fp.app.factory("fpSocket", function($rootScope, fpUtils) {
 		return function(padId) {
 			var scope = $rootScope.$new();
 
@@ -146,6 +146,6 @@
 
 			return scope;
 		};
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpTable.js b/frontend/js/fpTable.js
index 85865bc8..e04402d6 100644
--- a/frontend/js/fpTable.js
+++ b/frontend/js/fpTable.js
@@ -11,7 +11,7 @@
 		};
 	});
 
-	fp.app.factory("fpTable", [ "fpSocket", "fpDialogs", "$rootScope", "fpTypeFields", function(fpSocket, fpDialogs, $rootScope, fpTypeFields) {
+	fp.app.factory("fpTable", function(fpSocket, fpDialogs, $rootScope, fpTypeFields) {
 		function _getField(type, fieldName) {
 			for(var i=0; i<type.fields.length; i++) {
 				if(type.fields[i].name == fieldName)
@@ -56,6 +56,6 @@
 				fpDialogs.open("table.html", socket, "Table", null, true);
 			}
 		};
-	} ]);
+	});
 
 })(FacilPad, jQuery, angular);
\ No newline at end of file
diff --git a/frontend/js/fpUi.js b/frontend/js/fpUi.js
index 34107bb8..2742151f 100644
--- a/frontend/js/fpUi.js
+++ b/frontend/js/fpUi.js
@@ -1,6 +1,6 @@
 (function(fp, $, ng, undefined) {
 
-	fp.app.directive("fpSpinner", [ "$parse", function($parse) {
+	fp.app.directive("fpSpinner", function($parse) {
 		return {
 			restrict: 'A',
 			link: function(scope, element, attrs) {
@@ -17,9 +17,9 @@
 				});
 			}
 		}
-	} ]);
+	});
 
-	fp.app.directive("fpColourPicker", [ "fpUtils", "$templateCache", "$rootScope", "$compile", function(fpUtils, $templateCache, $rootScope, $compile) {
+	fp.app.directive("fpColourPicker", function(fpUtils, $templateCache, $rootScope, $compile) {
 		var colourPicker = $($templateCache.get("colour-picker.html")).appendTo("body").hide();
 		var scope = $rootScope.$new();
 		scope.colours = [ "ffffff", "ffccc9", "ffce93", "fffc9e", "ffffc7", "9aff99", "96fffb", "cdffff", "cbcefb", "cfcfcf", "fd6864",
@@ -62,7 +62,7 @@
 				});
 			}
 		}
-	} ]);
+	});
 
 	fp.app.directive("fpTitle", function() {
 		return {
diff --git a/frontend/js/fpUtils.js b/frontend/js/fpUtils.js
index a07a5d35..03fe0443 100644
--- a/frontend/js/fpUtils.js
+++ b/frontend/js/fpUtils.js
@@ -1,6 +1,6 @@
 (function(fp, $, ng, undefined) {
 
-	fp.app.factory("fpUtils", [ "$parse", function($parse) {
+	fp.app.factory("fpUtils", function($parse) {
 
 		var fpUtils = { };
 
@@ -130,7 +130,7 @@
 		};
 
 		return fpUtils;
-	} ]);
+	});
 
 	fp.app.filter('fpObjectFilter', function($filter){
 		return function(input, query) {