Remove unused, but slow code