remove a bunch of old strings, a few refactors