cleanup core syntax
relations in core