Converted lib/cleanup and lib/nav