Dependency cleanup and lint fix