Dev

HI. I think this will lighten dependencies and total app size, without losing functionality.. All tests passed with the changes made.