Removed unnecessary inputs