Fix terminal condition
Remove terminal check on blast
cleanup