Merge "Remove two unused constants"