removed unneeded constants