Got rid of old crap that was sitting around being confusing