remove a bunch of stuff we don't care about for now
a few small fixes