update choices and clean up dir