Cleaned up warnings, removed an unnecessary status code