Remove use of ETForest. Also cleaned up issues around unreachable basic