Deleted unesesery TODO args and classes that are not used