cleanup some constants