Revert "Cleaned out CommHandler"

This reverts commit 6b359a52d708aa223b9a9a9ac8a32cfc6587babe.