Has this already been refactored, and these are old comments?