Additional cleanup in Platform/Configuration