removed Number type usage
removed Number code