* removed unneeded code