Removed unnecesary parameters from the setup method