Removed unneded code