removed duplicated entry
removed unused code