Remove __old-stuff-to-refactor