Eliminated un-needed trait factories.  MASSIVE SIMPLIFICATION.