Remove environment support in .yml, #1257