Remove flush calls