Cleaned up runtime and removed enterList and leaveList.