Add in MOTD and remove old code