Is none of this code needed anymore?