remove gensym
removed some debug
lifted some lists