Feature/clean up

Note: The walk tool was simply copied from viceroy.

@shanejonas @stryderjzw @sophlee r?