fixing duplicate ID issue
cleanup