Fix several bugs with null blocks and removing old split branches
Fix several bugs with null blocks and removing old split branches

benedictpaten/cactus,benedictpaten/cactus,benedictpaten/cactus,benedictpaten/cactus,benedictpaten/cactus