Deleted unnecessary logic