Clean-up some constants files