Finished removing unnecessary status code