* cleanup. update temp parser