Anthony Joshua's rematch with Dillian Whyte is back on track after Joshua removes request for rematch clause