Feature spec cleanup