MAP - added final cleanUp()