Fixed Entity double free, and as a bonus, decreased coupling.