Cleaning up circle entity some.