Slight cleanups and commenting out test code