removed upneeded code