Removed code for ES