remove more checking
Merge pull request #1018 from ruil2/remove_check

remove more checking