Issue #380 Remove hardcoded loading message reference