Remove obsolete Number class and interface, tweak deps