removed unneded code