remove bucket hack closes #563