Clean up support class to discard features that are not being used.