Half working remove batch view
Merge branch 'phase2'