Fix everything dying, remove Brad's stupid code