Resolve diff with local cache or Get Bucket Response
Remove dead code