Fixed up unneeded code