Revert "UI Support for NW Discovery Happiness"

This reverts commit 32d9b4999f6cd28119d7c79f383d8875e5f6a338.