removed unneeded code