Is it possible to remove the commented test code (line 64-66)?