NIT: Cleanup unneeded code.