Remove old entity api hooks