Cleanup and only supporting latest MoP patch