Remove confusing clauses
auto-merge staging into master