Removing unneeded when reqs