cleanup the constants
Make it work with Bp 1.7+