cleaning out unused code part 1