Clean up, tweak internal dependency components