Fix declaration of Generics, which caused compiler warning.
Delete unused constants.