[DEV] Remove some dependency of the sub library