more integration cleanup