Index: libcfa/src/enum.hfa
===================================================================
--- libcfa/src/enum.hfa	(revision 1c0a3a4d74ba8a76960a99c6bd2e33c4e812b46e)
+++ libcfa/src/enum.hfa	(revision 509ec82ec97a0e2c2068fbd2db74e69196bc8024)
@@ -2,46 +2,4 @@
 
 #include "iostream.hfa"
-
-forall( E ) trait Bounded {
-	E lowerBound(void);
-	E upperBound(void);
-};
-
-forall( E | Bounded( E ) ) trait Serial {
-	int fromInstance( E e );
-	E fromInt_unsafe( int i );
-	E succ_unsafe( E e );
-	E pred_unsafe( E e );
-};
-
-forall( E | Serial( E ) ) {
-	E fromInt( int i );
-	E succ( E e );
-	E pred( E e );
-	int Countof( E );
-}
-
-// forall( E | Bounded(E) ) trait SafeSerial {
-//	 // unsigned fromInstance( E e );
-//	 E fromInt_unsafe( unsigned i );
-//	 // E succ_unsafe( E e );
-//	 //E pred_unsafe( E e );
-
-//	 unsigned fromInstance( E e );
-//	 E fromInt( unsigned i );
-//	 E succ( E e );
-//	 E pred( E e );
-// };
-
-forall( E ) trait CfaEnum {
-	const char * label( E e );
-	int posn( E e );
-};
-
-forall( E, V | CfaEnum( E ) ) trait TypedEnum {
-	V value( E e );
-};
-
-// I/O
 
 forall( istype & | istream( istype ), E | CfaEnum( E ) | Serial(E) )