Can you make it so the pigs headtraps become -removable and active after all gens have been finished

As the headtraps are right now they are really weak but if they were made inactive and unremovable till the gens were done it would take a whole lot of micromanaging off the killer and give her a chance to play into the jigsaw role of make your choice (Free your self and flee or Stay and help others escape)