Remove cross module dependency on motd