Module clean up
Updates dependencies