* Cleanup FeatureGate skippers * Perform changes requested by review * some more review related changes * Rename skipper functions to make code more readable * add utilfeature back in