Remove more CLI stuff.