Remove universal definition - will incorporate into build