further cleanup

review @densh