[maintenance] further simplifications