Remove unnecessary status codes