Clean up confusing/outdated comments and redundant code.