Remove these rather than comment them out. They are gone in master.