removed leftover constants