removed unneded complexity