Remove old Entity code.