remove functions and constants

Change-Id: Ibd97342335704f01aebd2512dff990f088a50ff9