removed some constants that were no longer needed