Some more cleanup v2
Some more cleanup v2