further cleanup examples