Cleanup's for Tim. Also dropping support back to ipv4 only while I find out