clean up for 2.9.2 mac