Remove hard-coded bucket