More cleanup and IANA rework