better scene cleanup