Removed unneeded fixtures
merge, no conflicts