Remove status handling, it's broken