Cleanup unused code
Exclude sender from broadcast