Fixed off by one error on Remove functoin return value