Housekeeping to minimize clutter in main app.