#79 junk removed