Basic changs to remove Numeric dependency

Made changes to remove the Numeric dependency in several files.