Drop use of ApplicationStatusSource, simplify, add notes