removal a few unneeded constants