Removal of constants.h