Fix api and remove cassie