Fix premature prefix stripping.
Remove some debug messages.