rewrite nick tracking basically, remove a bunch of unused shite [#537]