removes some unused bucket code