Remove debug code, update bucket