Dependency cleanup

@geometrid Small changes, quick review when you get a second.