removing old status handling code