Activejob cleanups