Get rid of caps from brandon stuff that got merged