Merge "Revert "Refeactor region clearing / allocation code""