cleanup sloppy use of bucket objects (from moving code around)