Deleted unnesessary methods and args
Deleted unnesessary methods and args