Moved 2ndpass check logic to language module
Removed useless check