Removed all the non-CLI stuff