Updated header info. Removed all Comm class usage.