remvoe unnecessary check from parser