Remove 71 line after simplify the module implementation