single page cleanup, still ugly