Wip/cleanup v2

pull req