Remove unneeded steps after introduction of fixtures