Removed deprecated global methods

Change-Id: I4239f459878a25ffb81b7b438df4f803ff07b291