Remove logging and fix signaling changes