Cleaned up debugging cruft.