Remove enabling/disabling of Entity