remove a lot of the borderline stuff