[PATCH 0/4] MR1013: Mostly cleanup