Removed more testing code that snuck in earlier.