cleanup, updated dependencies