Registry cleanup, again D: