Minor cleanup and registration removal.