removed a bit of unneeded kruft