EPD-302: Removed legacy MSI code