Remove redundant arguments from completion block