Business Protection App cleanups