Consistent platforms: Remove unecessary method
Consistent platforms: Removed TODOs
Consistent platforms: A first attempt at defaults

IntegTests still fail, but not nearly as many