Remove some hard Entity references