Cleaned up MR api