Cleaned-up some socket emits