removed unneeded code?