diff --git a/Angle.cpp b/Angle.cpp
index c88afdc..535edd7 100644
--- a/Angle.cpp
+++ b/Angle.cpp
@@ -8,29 +8,9 @@
 
 const float Rad2Deg = 57.29578F;
 const float Deg2Rad = 0.0174532924F;
-/*
-float Angle::Normalize(float angle) {
-  if (!isfinite(angle))
-    return angle;
-
-  while (angle <= -180)
-    angle += 360;
-  while (angle > 180)
-    angle -= 360;
-  return angle;
-}
-*/
 
 //----------------------
 
-template <typename T> AngleOf<T>::AngleOf() : value(0) {}
-
-template <typename T> const AngleOf<T> AngleOf<T>::zero = AngleOf<T>();
-// template <typename T>
-// const AngleOf<T> AngleOf<T>::deg90 = AngleOf<T>::Degrees(90);
-// template <typename T>
-// const AngleOf<T> AngleOf<T>::deg180 = AngleOf<T>::Degrees(180);
-
 //===== AngleSingle, AngleOf<float>
 
 template <> AngleOf<float> AngleOf<float>::Degrees(float degrees) {
@@ -119,6 +99,10 @@ template <> float AngleOf<signed char>::InRadians() const {
 
 //===== Generic
 
+template <typename T> AngleOf<T>::AngleOf() : value(0) {}
+
+template <typename T> const AngleOf<T> AngleOf<T>::zero = AngleOf<T>();
+
 template <typename T> AngleOf<T> AngleOf<T>::Binary(T rawValue) {
   AngleOf<T> angle = AngleOf<T>();
   angle.SetBinary(rawValue);