base: cleanup to Extend
edf: Cleaned up finalizers
edf: validation