Remove unused constants

Change-Id: I0a9cb8789ac7e3ffa0938e3b8ed04656c3d5a749
Merge "Remove unused constants"