finished boolean operation upgrade + VM/BCG cleanup