more core git clean-up