some cleanups that were missed from #1 (job and event models)