It would be great if we can remove these two dependencies.  This problem bothered @yinxusen and I a lot today, didn't figure out how to remove them :(