Remove exit, shouldn't be required