update with lots of cleanup

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>