Some bullet cleanup