remove unecessary code part1