Removed a bunch of debug cruft and commented-out code