Updated dependencies
Refactored due to some lint errors
Removed unnecessary modules
Refactored due to some lint issues
Removed unnecessary modules