communicator: cleanup useless stuff