Change remove API and make sure we depend on ourselves.