[TASK] Cleanup for global design usage (refs #388)