removed excessive checks
removed test for excessive checks