MP1-4341 : Cleanup code and change Wiki link.