Continue cleanup of implementations, ensuring that all values are getting supported