clean up, and funext from propositional truncation