Remove CLI, add new targets