Removed unnecessary function parameters