Remove status logic