clean up unnecessery changes for mesa patch