Removed code required for MW < 1.17, including an i18n message

Change-Id: Ifaf8bcbcd7c7e89c569660f813f4492977edb0b7