App manager cruft

See commit comments