some cleanup, also removed unneeded isSettled functions - using events now instead