Got rid of unneeded code.