Removed code no longer necessary now that MW 1.16 is not supported

Change-Id: I83d9af8d725effba344a3fa63a915c17e6d5b819