core: clean up default logic