cleanup
TODO run api throught cli