remove code from the cli to improve programming api