removed dependecy cycles in core