cleanup and stubbed intersection