Removed layer 2 discovery parts in core as it is within pack now