rnc and goldmann Remove unused test code