Removed global selectors CORE-609