remove dhb folder in HJ branch to avoid name conflict...maybe we should remove hj folder from dhb branch also