Deleted unesesery TODO args and deleted unused class
Merge branch 'master' of https://github.com/BackSpace47/main