Remove Static Constants