deleted unnecessary old code