cleanup unneeded code.