removed offline taps, cleaned some stuff up
long time, no commit.
long time, no commit