removed confusing extra code