Fixture definitions cleanup