removes some unused bucket code + issue clean-ups