DF-4250 review fixes: removed comments, removed DisconnectFromSignals, removed wrong if that could cause memory leak