Code clean up

This resolves some problematic dependencies and several
deprecation/linting warnings