JARVIS-338 Removed unused deps and fixed lint issues