big cleanup, no more html or figure