use correct constant
remove unused constants