Unneeded code reformed