removed constants from core