Removed HAPN, CCIR, EEA, EIA. Cleaned up sources.