Partial code cleanup; updated dependencies