tommyz7 remove NotSmartContract check