removed some constants