cleanup: deleted unnecessary if clauses