Removed entities code