removed more constants