[Applications] Final cleanups.

(references #5196, gh-36)